From 8e2fdc4bc01bde0f5ec22f5a07284974751581f8 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Wed, 14 Feb 2024 21:12:39 +0100 Subject: [PATCH 1/3] GHA: Fix web gdextension build --- .github/workflows/gdextension.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml index cf455dd1..9bea8368 100644 --- a/.github/workflows/gdextension.yml +++ b/.github/workflows/gdextension.yml @@ -34,6 +34,8 @@ on: env: SCONS_CACHE_LIMIT: 4096 SCONSFLAGS: dev_build=no debug_symbols=no + EM_VERSION: 3.1.45 + EM_CACHE_FOLDER: "emsdk-cache" jobs: gdextension: @@ -144,8 +146,27 @@ jobs: python-version: "3.x" architecture: "x64" + - name: Set up Emscripten cache + if: matrix.opts.platform == 'web' + uses: actions/cache@v3 + with: + path: ${{env.EM_CACHE_FOLDER}} + key: ${{env.EM_VERSION}}-${{runner.os}}-libs + + - name: Set up Emscripten + if: matrix.opts.platform == 'web' + uses: mymindstorm/setup-emsdk@v12 + with: + version: ${{env.EM_VERSION}} + actions-cache-folder: ${{env.EM_CACHE_FOLDER}} + + - name: Verify Emscripten setup + if: matrix.opts.platform == 'web' + run: | + emcc -v + - name: Set up scons - if: matrix.opts.platform == 'windows' || matrix.opts.platform == 'macos' + if: matrix.opts.platform == 'windows' || matrix.opts.platform == 'macos' || matrix.opts.platform == 'web' run: | python -c "import sys; print(sys.version)" python -m pip install scons==4.4.0 From 69751260a662a552630e01712cb0b68726f30fb0 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Wed, 14 Feb 2024 21:25:20 +0100 Subject: [PATCH 2/3] GHA: Update path-ignore --- .github/workflows/test_builds.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test_builds.yml b/.github/workflows/test_builds.yml index 0779628f..e494d65c 100644 --- a/.github/workflows/test_builds.yml +++ b/.github/workflows/test_builds.yml @@ -3,19 +3,19 @@ on: workflow_dispatch: push: - branches: [ master ] + branches: [master] paths-ignore: - "README.md" - - "LICENSE" + - "LICENSE.md" - "**/*.png" - "demo/**" - "doc/**" pull_request: - branches: [ master ] + branches: [master] paths-ignore: - "README.md" - - "LICENSE" + - "LICENSE.md" - "**/*.png" - "demo/**" - "doc/**" @@ -77,8 +77,8 @@ jobs: - name: Set up Python 3.x uses: actions/setup-python@v4 with: - python-version: '3.x' - architecture: 'x64' + python-version: "3.x" + architecture: "x64" - name: Set up scons run: | From b5247dda0f729903871142f1957340bebf9912be Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Thu, 15 Feb 2024 12:05:12 +0100 Subject: [PATCH 3/3] GHA: Fix strip running and failing in gdextension web --- .github/workflows/gdextension.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gdextension.yml b/.github/workflows/gdextension.yml index 9bea8368..d69659e1 100644 --- a/.github/workflows/gdextension.yml +++ b/.github/workflows/gdextension.yml @@ -216,7 +216,7 @@ jobs: ls -R out/ - name: Strip lib - if: matrix.opts.platform != 'windows' + if: matrix.opts.platform != 'windows' && matrix.opts.platform != 'web' run: | ls -l -R out/addons/limboai/bin/ echo "---"