diff --git a/.github/actions/godot-cache-restore/action.yml b/.github/actions/godot-cache-restore/action.yml index f10222bf5..327f29823 100644 --- a/.github/actions/godot-cache-restore/action.yml +++ b/.github/actions/godot-cache-restore/action.yml @@ -12,7 +12,7 @@ runs: using: composite steps: - name: Restore SCons cache directory - uses: actions/cache/restore@v4 + uses: actions/cache/restore@v6 with: path: ${{ inputs.scons-cache }} key: ${{ inputs.cache-name }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }} diff --git a/.github/actions/godot-cache-save/action.yml b/.github/actions/godot-cache-save/action.yml index df877cec6..13c25cb58 100644 --- a/.github/actions/godot-cache-save/action.yml +++ b/.github/actions/godot-cache-save/action.yml @@ -12,7 +12,7 @@ runs: using: composite steps: - name: Save SCons cache directory - uses: actions/cache/save@v4 + uses: actions/cache/save@v6 with: path: ${{ inputs.scons-cache }} key: ${{ inputs.cache-name }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }} diff --git a/.github/actions/setup-godot-cpp/action.yml b/.github/actions/setup-godot-cpp/action.yml index 33f0927fb..0eede5924 100644 --- a/.github/actions/setup-godot-cpp/action.yml +++ b/.github/actions/setup-godot-cpp/action.yml @@ -34,7 +34,7 @@ runs: using: composite steps: - name: Setup Python (for SCons) - uses: actions/setup-python@v5 + uses: actions/setup-python@v7 with: python-version: 3.x @@ -47,7 +47,7 @@ runs: - name: Setup Web dependencies if: inputs.platform == 'web' - uses: mymindstorm/setup-emsdk@v14 + uses: emscripten-core/setup-emsdk@v16 with: version: ${{ inputs.em-version }} no-cache: true @@ -68,4 +68,7 @@ runs: - name: Install Ninja if: ${{ inputs.buildtool == 'cmake' }} - uses: ashutoshvarma/setup-ninja@master + shell: bash + run: | + python -m pip install ninja + ninja --version diff --git a/.github/workflows/ci-cmake.yml b/.github/workflows/ci-cmake.yml index a839d34fd..f744110f7 100644 --- a/.github/workflows/ci-cmake.yml +++ b/.github/workflows/ci-cmake.yml @@ -142,7 +142,7 @@ jobs: run: ${SCCACHE_PATH} --show-stats - name: Download latest Godot artifacts - uses: dsnopek/action-download-artifact@1322f74e2dac9feed2ee76a32d9ae1ca3b4cf4e9 + uses: dsnopek/action-download-artifact@5574e249433477c4e345425ce814b2f07f957804 if: matrix.run-tests && env.GODOT_TEST_VERSION == 'master' with: repo: godotengine/godot diff --git a/.github/workflows/ci-scons.yml b/.github/workflows/ci-scons.yml index fa1535fbe..fe86c115f 100644 --- a/.github/workflows/ci-scons.yml +++ b/.github/workflows/ci-scons.yml @@ -175,7 +175,7 @@ jobs: continue-on-error: true - name: Download latest Godot artifacts - uses: dsnopek/action-download-artifact@1322f74e2dac9feed2ee76a32d9ae1ca3b4cf4e9 + uses: dsnopek/action-download-artifact@5574e249433477c4e345425ce814b2f07f957804 if: matrix.run-tests with: repo: godotengine/godot