diff --git a/.github/actions/android-deps/action.yml b/.github/actions/android-deps/action.yml index c3e3fd13..86c99633 100644 --- a/.github/actions/android-deps/action.yml +++ b/.github/actions/android-deps/action.yml @@ -4,7 +4,7 @@ runs: using: "composite" steps: - name: (Android) Set up Java 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 11 diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 91ffba3c..3aba093f 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -32,7 +32,6 @@ jobs: submodules: recursive - name: (Android) Set up Android dependencies - if: ${{ startsWith(matrix.identifier, 'android-') }} uses: ./.github/actions/android-deps - name: Setup python & scons @@ -45,12 +44,10 @@ jobs: SCONS_CACHE_LIMIT: 7168 run: | scons target='${{ matrix.target }}' platform='${{ matrix.platform }}' arch='${{ matrix.arch }}' ${{ env.SCONSFLAGS }} -j2 - ls -l project/addons/terrain_3d/bin/ - name: Prepare artifact shell: sh run: | - strip project/addons/terrain_3d/bin/libterrain.* ls -l project/addons/terrain_3d/bin/ cp --no-clobber '${{ github.workspace }}/README.md' '${{ github.workspace }}/LICENSE' ${{ github.workspace }}/project/addons/terrain_3d/ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 65c135a1..7c12c433 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,10 +36,12 @@ jobs: target: template_release platform: windows arch: x86_64 - - name: macOS Debug + - identifier: macos-debug + name: macOS Debug target: template_debug platform: macos - - name: macOS Release + - identifier: macos-release + name: macOS Release target: template_release platform: macos - identifier: android-debug @@ -83,16 +85,13 @@ jobs: SCONS_CACHE_LIMIT: 7168 run: | scons target='${{ matrix.target }}' platform='${{ matrix.platform }}' arch='${{ matrix.arch }}' ${{ env.SCONSFLAGS }} -j2 - ls -l project/addons/terrain_3d/bin/ - name: Strip libraries + if: ${{ startsWith(matrix.identifier, 'windows-') }} || ${{ startsWith(matrix.identifier, 'linux-') }} shell: sh run: | - if [ -x "project/addons/terrain_3d/bin/libterrain.macos.debug.framework" ]; then - strip project/addons/terrain_3d/bin/libterrain.macos.{debug,release}.framework/* - else - strip project/addons/terrain_3d/bin/libterrain.* - fi + ls -l project/addons/terrain_3d/bin/ + strip project/addons/terrain_3d/bin/libterrain.* ls -l project/addons/terrain_3d/bin/ - name: Prepare artifact diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 53c1e379..7e69a89c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -45,11 +45,11 @@ jobs: SCONS_CACHE_LIMIT: 7168 run: | scons target='${{ matrix.target }}' platform='${{ matrix.platform }}' arch='${{ matrix.arch }}' ${{ env.SCONSFLAGS }} -j2 - ls -l project/addons/terrain_3d/bin/ - name: Prepare artifact shell: sh run: | + ls -l project/addons/terrain_3d/bin/ strip project/addons/terrain_3d/bin/libterrain.* ls -l project/addons/terrain_3d/bin/ cp --no-clobber '${{ github.workspace }}/README.md' '${{ github.workspace }}/LICENSE' ${{ github.workspace }}/project/addons/terrain_3d/ diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 280b79dc..916d34e5 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -35,13 +35,11 @@ jobs: SCONS_CACHE_LIMIT: 7168 run: | scons target='${{ matrix.target }}' platform='${{ matrix.platform }}' arch='${{ matrix.arch }}' ${{ env.SCONSFLAGS }} -j2 - ls -l project/addons/terrain_3d/bin/ - name: Prepare artifact shell: sh run: | - strip project/addons/terrain_3d/bin/libterrain.macos.{debug,release}.framework/* - ls -l project/addons/terrain_3d/bin/ + ls -l project/addons/terrain_3d/bin/*/ cp --no-clobber '${{ github.workspace }}/README.md' '${{ github.workspace }}/LICENSE' ${{ github.workspace }}/project/addons/terrain_3d/ - name: Upload artifact diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index da2212f9..608e183f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -1,4 +1,4 @@ -name: 🪟 Build (Windows) +name: 🪟 Windows Builds on: workflow_dispatch env: @@ -49,11 +49,11 @@ jobs: SCONS_CACHE_LIMIT: 7168 run: | scons target='${{ matrix.target }}' platform='${{ matrix.platform }}' arch='${{ matrix.arch }}' ${{ env.SCONSFLAGS }} -j2 - ls -l project/addons/terrain_3d/bin/ - name: Prepare artifact shell: sh run: | + ls -l project/addons/terrain_3d/bin/ strip project/addons/terrain_3d/bin/libterrain.* ls -l project/addons/terrain_3d/bin/ cp --no-clobber '${{ github.workspace }}/README.md' '${{ github.workspace }}/LICENSE' ${{ github.workspace }}/project/addons/terrain_3d/