diff --git a/.github/workflows/docker-build-and-test.yml b/.github/workflows/docker-build-and-test.yml index 83890ef6..05459202 100644 --- a/.github/workflows/docker-build-and-test.yml +++ b/.github/workflows/docker-build-and-test.yml @@ -135,7 +135,7 @@ jobs: yq -r '.services.["${{ matrix.dockerfile }}"].build.args[] | select(test("COREBOOT_VERSION=.*"))' docker/compose.yaml >> "${GITHUB_OUTPUT}" - name: Restore cached coreboot repo - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 id: cache-coreboot-repo with: path: ./coreboot @@ -145,7 +145,7 @@ jobs: run: | git clone --depth 1 "https://review.coreboot.org/coreboot.git" -b "${{ steps.version.outputs.COREBOOT_VERSION }}" - name: Store coreboot repo in cache - uses: actions/cache/save@v5 + uses: actions/cache/save@v6 if: steps.cache-coreboot-repo.outputs.cache-hit != 'true' with: path: ./coreboot @@ -217,7 +217,7 @@ jobs: - name: Restore cached toolchains id: cache-toolchains - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 if: steps.toolchains-exist.outputs.EXIST == 'false' with: path: | @@ -226,7 +226,7 @@ jobs: key: ${{ steps.cache-key.outputs.CACHE_KEY }} - name: Restore cached tools id: cache-tools - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 if: steps.tools-exist.outputs.EXIST == 'false' with: path: | @@ -306,7 +306,7 @@ jobs: # Store toolchains and utils in cache - name: Cache toolchains - uses: actions/cache/save@v5 + uses: actions/cache/save@v6 if: steps.toolchains-exist.outputs.EXIST == 'false' && steps.cache-toolchains.outputs.cache-hit != 'true' with: path: | @@ -314,7 +314,7 @@ jobs: ${{ steps.tar-filename.outputs.TAR_FILENAME }}.sha256 key: ${{ steps.cache-key.outputs.CACHE_KEY }} - name: Cache tools - uses: actions/cache/save@v5 + uses: actions/cache/save@v6 if: steps.tools-exist.outputs.EXIST == 'false' && steps.cache-tools.outputs.cache-hit != 'true' with: path: | @@ -401,7 +401,7 @@ jobs: run: yq -r '.services.["${{ matrix.dockerfile }}"].build.args[] | select(test("COREBOOT_VERSION=.*"))' docker/compose.yaml >> "${GITHUB_OUTPUT}" - name: Restore cached coreboot repo - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 if: startsWith(matrix.dockerfile, 'coreboot') id: cache-coreboot-repo with: @@ -412,7 +412,7 @@ jobs: run: | git clone --depth 1 "https://review.coreboot.org/coreboot.git" -b "${{ steps.version.outputs.COREBOOT_VERSION }}" - name: Store coreboot repo in cache - uses: actions/cache/save@v5 + uses: actions/cache/save@v6 if: startsWith(matrix.dockerfile, 'coreboot') && steps.cache-coreboot-repo.outputs.cache-hit != 'true' with: path: ./coreboot diff --git a/.github/workflows/documentation-pages.yml b/.github/workflows/documentation-pages.yml index cb13202d..b581449c 100644 --- a/.github/workflows/documentation-pages.yml +++ b/.github/workflows/documentation-pages.yml @@ -42,7 +42,7 @@ jobs: submodules: 'recursive' - name: Restore cached mdbook cargo stuff - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 with: path: | ~/.cargo/registry/ @@ -76,7 +76,7 @@ jobs: echo "::endgroup::" - name: Store mdbook cargo stuff - uses: actions/cache/save@v5 + uses: actions/cache/save@v6 with: path: | ~/.cargo/registry/ diff --git a/.github/workflows/example.yml b/.github/workflows/example.yml index 04fa30ab..ad625feb 100644 --- a/.github/workflows/example.yml +++ b/.github/workflows/example.yml @@ -134,7 +134,7 @@ jobs: uses: actions/checkout@v7 - name: Restore cached coreboot repo - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 id: cache-repo with: path: ./my_super_dooper_awesome_coreboot @@ -144,7 +144,7 @@ jobs: run: | git clone --branch "${{ matrix.coreboot-version }}" --depth 1 https://review.coreboot.org/coreboot my_super_dooper_awesome_coreboot - name: Store coreboot repo in cache - uses: actions/cache/save@v5 + uses: actions/cache/save@v6 if: steps.cache-repo.outputs.cache-hit != 'true' with: path: ./my_super_dooper_awesome_coreboot @@ -197,7 +197,7 @@ jobs: - name: Restore cached linux source id: cache-repo - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 with: path: ./linux-${{ matrix.linux-version }}.tar.xz key: linux-${{ matrix.linux-version }}-example @@ -215,7 +215,7 @@ jobs: env: LINUX_MAJOR_VERSION: 6 - name: Store linux source in cache - uses: actions/cache/save@v5 + uses: actions/cache/save@v6 if: steps.cache-repo.outputs.cache-hit != 'true' with: path: ./linux-${{ matrix.linux-version }}.tar.xz @@ -268,7 +268,7 @@ jobs: uses: actions/checkout@v7 - name: Restore cached edk2 repo - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 id: cache-repo with: path: ./Edk2 @@ -281,7 +281,7 @@ jobs: run: | echo "-D BOOTLOADER=COREBOOT -D TPM_ENABLE=TRUE -D NETWORK_IPXE=TRUE" > "edk2_config.cfg" - name: Store edk2 repo in cache - uses: actions/cache/save@v5 + uses: actions/cache/save@v6 if: steps.cache-repo.outputs.cache-hit != 'true' with: path: ./Edk2 @@ -344,7 +344,7 @@ jobs: uses: actions/checkout@v7 - name: Restore cached coreboot-blobs repo - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 id: cache-repo with: path: ./stitch @@ -354,7 +354,7 @@ jobs: run: | git clone --depth 1 https://review.coreboot.org/blobs stitch - name: Store coreboot-blobs repo in cache - uses: actions/cache/save@v5 + uses: actions/cache/save@v6 if: steps.cache-repo.outputs.cache-hit != 'true' with: path: ./stitch @@ -399,7 +399,7 @@ jobs: uses: actions/checkout@v7 - name: Restore cached u-root repo - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 id: cache-repo with: path: ./u-root @@ -409,7 +409,7 @@ jobs: run: | git clone --depth 1 --branch v${{ matrix.uroot-version }} https://github.com/u-root/u-root.git || true - name: Store u-root repo in cache - uses: actions/cache/save@v5 + uses: actions/cache/save@v6 if: steps.cache-repo.outputs.cache-hit != 'true' with: path: ./u-root @@ -454,7 +454,7 @@ jobs: uses: actions/checkout@v7 - name: Restore cached u-boot repo - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 id: cache-repo with: path: ./u-boot @@ -467,7 +467,7 @@ jobs: git fetch -a git checkout "v${{ matrix.uboot-version }}" - name: Store u-boot repo in cache - uses: actions/cache/save@v5 + uses: actions/cache/save@v6 if: steps.cache-repo.outputs.cache-hit != 'true' with: path: ./u-boot @@ -613,7 +613,7 @@ jobs: uses: actions/checkout@v7 - name: Restore cached u-root repo - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 id: cache-repo with: path: ./u-root @@ -623,7 +623,7 @@ jobs: run: | git clone --depth 1 --branch v${{ matrix.uroot-version }} https://github.com/u-root/u-root.git - name: Store u-root repo in cache - uses: actions/cache/save@v5 + uses: actions/cache/save@v6 if: steps.cache-repo.outputs.cache-hit != 'true' with: path: ./u-root diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml index 5d2baef0..0f7271e9 100644 --- a/.github/workflows/go-test.yml +++ b/.github/workflows/go-test.yml @@ -134,7 +134,7 @@ jobs: go get -d ./... - name: Restore cached tmp files - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 id: cache-tmp-files with: path: /tmp/__firmware-action_tmp_files__ @@ -146,7 +146,7 @@ jobs: go test -race -v -timeout 60m -shuffle=on -covermode=atomic -coverprofile "coverage-${{ matrix.testregex }}.out" -run ${{ matrix.testregex }} ./... - name: Store tmp files - uses: actions/cache/save@v5 + uses: actions/cache/save@v6 if: steps.cache-tmp-files.outputs.cache-hit != 'true' with: path: /tmp/__firmware-action_tmp_files__ diff --git a/action.yml b/action.yml index 24624f79..687d13ab 100644 --- a/action.yml +++ b/action.yml @@ -276,7 +276,7 @@ runs: # overkill for what we want. - name: restore_cache - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 if: inputs.enable-cache == 'true' id: cache with: @@ -417,7 +417,7 @@ runs: - name: save_cache if: ${{ always() && inputs.enable-cache == 'true' }} - uses: actions/cache/save@v5 + uses: actions/cache/save@v6 with: path: .firmware-action/ key: firmware-action-${{ inputs.target }}-${{ hashFiles(inputs.config) }}-${{ github.sha }}-${{ github.run_id }}