Skip to content

Commit 61a9bf7

Browse files
committed
Updated workflow to build windows libraries using the vanilla build scripts
1 parent 1ea2ae7 commit 61a9bf7

File tree

1 file changed

+34
-30
lines changed

1 file changed

+34
-30
lines changed

.github/workflows/branch-artifacts.yml

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,7 @@ jobs:
343343

344344
build-windows:
345345
if: ${{ github.event.inputs.platform == 'x86-win32' || github.event.inputs.platform == 'x86_64-win32' || github.event.inputs.platform == 'all' }}
346-
needs: prepare-defoldsdk
347-
runs-on: ubuntu-22.04
346+
runs-on: windows-2022
348347
strategy:
349348
matrix:
350349
platform: ${{ fromJSON(github.event.inputs.platform == 'all' && '["x86_64-win32"]' || format('["{0}"]', github.event.inputs.platform)) }}
@@ -354,12 +353,10 @@ jobs:
354353
with:
355354
fetch-depth: 1
356355

357-
- name: Install Linux build tools
358-
shell: bash
359-
run: |
360-
set -euo pipefail
361-
sudo apt-get update
362-
sudo apt-get install -y wget python3-ply
356+
- name: Setup Python 3
357+
uses: actions/setup-python@v5
358+
with:
359+
python-version: "3.x"
363360

364361
- name: Clone Rive runtime
365362
shell: bash
@@ -373,39 +370,46 @@ jobs:
373370
(cd "$RIVE_TMP_DIR" && git fetch --depth 1 origin "${{ github.event.inputs.rive_ref }}" && git checkout --force "${{ github.event.inputs.rive_ref }}")
374371
fi
375372
echo "RIVE_TMP_DIR=$RIVE_TMP_DIR" >> "$GITHUB_ENV"
376-
- name: Setup Temurin Java 21
377-
uses: actions/setup-java@v4
373+
374+
- name: Setup VS DevCmd (x64)
375+
if: ${{ matrix.platform == 'x86_64-win32' }}
376+
uses: ilammy/msvc-dev-cmd@v1
378377
with:
379-
distribution: 'temurin'
380-
java-version: '25'
378+
arch: x64
379+
vsversion: 2022
380+
toolset: 14.20
381+
sdk: 10.0.22621.0
382+
383+
- name: Setup VS DevCmd (x86)
384+
if: ${{ matrix.platform == 'x86-win32' }}
385+
uses: ilammy/msvc-dev-cmd@v1
386+
with:
387+
arch: x86
388+
vsversion: 2022
389+
toolset: 14.20
390+
sdk: 10.0.22621.0
381391

382-
- name: Verify Java
383-
shell: bash
384-
run: |
385-
set -euo pipefail
386-
java --version
392+
- name: Setup CMake 4.1
393+
uses: lukka/get-cmake@v4.1.1
387394

388-
- name: Restore Defold SDK and bob.jar from cache
389-
uses: actions/cache/restore@v4
390-
with:
391-
path: |
392-
bob.jar
393-
build/defoldsdk
394-
key: ${{ needs.prepare-defoldsdk.outputs.defoldsdk_cache_key }}
395-
enableCrossOsArchive: true
396-
fail-on-cache-miss: true
395+
- name: MSBuild sanity check
396+
shell: pwsh
397+
run: |
398+
msbuild -version
399+
Get-Command msbuild.exe | Format-List -Property Source
397400
398-
- name: Verify Bob
401+
- name: Install DirectX Shader Compiler (DXC)
399402
shell: bash
400403
run: |
401404
set -euo pipefail
402-
java -jar ./bob.jar -version
405+
choco install directxshadercompiler -y || true
406+
dxc.exe -version 2> /dev/null || true
403407
404-
- name: Build libraries
408+
- name: Build libraries with Vulkan
405409
shell: bash
406410
run: |
407411
set -euo pipefail
408-
BOB=./bob.jar ./utils/build_pls.sh --rive "$RIVE_TMP_DIR" "${{ matrix.platform }}"
412+
./utils/build_rive_runtime.sh "${{ matrix.platform }}" "$RIVE_TMP_DIR" --with-vulkan
409413
410414
- name: Commit native libs
411415
if: ${{ github.event.inputs.push_changes == 'true' }}

0 commit comments

Comments
 (0)