diff options
| author | denobot <33910674+denobot@users.noreply.github.com> | 2023-05-18 20:44:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-18 20:44:10 +0200 |
| commit | 877b38b37043c1f45577f1835119caa7df6169e3 (patch) | |
| tree | d179bc902cc20ca5732b2b09a9617cba826b4566 /.github/workflows | |
| parent | 6241a657ae9b63d4e529853b19e6666e5fa7f653 (diff) | |
chore: forward v1.33.4 release commit to main (#19181)
**THIS PR HAS GIT CONFLICTS THAT MUST BE RESOLVED**
This is the release commit being forwarded back to main for 1.33.4
Please ensure:
- [x] Everything looks ok in the PR
- [ ] The release has been published
To make edits to this PR:
```shell
git fetch upstream forward_v1.33.4 && git checkout -b forward_v1.33.4 upstream/forward_v1.33.4
```
Don't need this PR? Close it.
cc @levex
Co-authored-by: levex <levex@users.noreply.github.com>
Co-authored-by: Levente Kurusa <lkurusa@kernelstuff.org>
Diffstat (limited to '.github/workflows')
| -rwxr-xr-x | .github/workflows/ci.generate.ts | 4 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index 84ff65b4c..9bd2839b1 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -17,7 +17,7 @@ const Runners = (() => { })(); // bump the number at the start when you want to purge the cache const prCacheKeyPrefix = - "26-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-"; + "27-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-"; const installPkgsCommand = "sudo apt-get install --no-install-recommends debootstrap clang-15 lld-15"; @@ -480,7 +480,7 @@ const ci = { "~/.cargo/git/db", ].join("\n"), key: - "26-cargo-home-${{ matrix.os }}-${{ hashFiles('Cargo.lock') }}", + "27-cargo-home-${{ matrix.os }}-${{ hashFiles('Cargo.lock') }}", }, }, { diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9679ffbb6..dd0f72d73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -293,7 +293,7 @@ jobs: ~/.cargo/registry/index ~/.cargo/registry/cache ~/.cargo/git/db - key: '26-cargo-home-${{ matrix.os }}-${{ hashFiles(''Cargo.lock'') }}' + key: '27-cargo-home-${{ matrix.os }}-${{ hashFiles(''Cargo.lock'') }}' if: '!(github.event_name == ''pull_request'' && matrix.skip_pr)' - name: Restore cache build output (PR) uses: actions/cache/restore@v3 @@ -305,7 +305,7 @@ jobs: !./target/*/*.zip !./target/*/*.tar.gz key: never_saved - restore-keys: '26-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-' + restore-keys: '27-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-' - name: Apply and update mtime cache if: '!(github.event_name == ''pull_request'' && matrix.skip_pr) && (!startsWith(github.ref, ''refs/tags/''))' uses: ./.github/mtime_cache @@ -589,7 +589,7 @@ jobs: !./target/*/gn_out !./target/*/*.zip !./target/*/*.tar.gz - key: '26-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}' + key: '27-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}' publish-canary: name: publish canary runs-on: ubuntu-22.04 |