Skip to content

Commit 7f95363

Browse files
authored
Merge pull request rust-lang#233 from paulcacheux/paulcacheux/bump-github-actions
Bump Github actions
2 parents e84f9a1 + cd01e8d commit 7f95363

File tree

2 files changed

+14
-24
lines changed

2 files changed

+14
-24
lines changed

.github/workflows/ci.yml

+8-13
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ jobs:
3535
]
3636

3737
steps:
38-
- uses: actions/checkout@v2
38+
- uses: actions/checkout@v3
3939

40-
- uses: actions/checkout@v2
40+
- uses: actions/checkout@v3
4141
with:
4242
repository: llvm/llvm-project
4343
path: llvm
@@ -71,39 +71,34 @@ jobs:
7171
- name: Set RUST_COMPILER_RT_ROOT
7272
run: echo "RUST_COMPILER_RT_ROOT="${{ env.workspace }}/llvm/compiler-rt >> $GITHUB_ENV
7373

74-
# https://github.com/actions/cache/issues/133
75-
- name: Fixup owner of ~/.cargo/
76-
# Don't remove the trailing /. It is necessary to follow the symlink.
77-
run: sudo chown -R $(whoami):$(id -ng) ~/.cargo/
78-
7974
- name: Cache cargo installed crates
80-
uses: actions/cache@v1.1.2
75+
uses: actions/cache@v3
8176
with:
8277
path: ~/.cargo/bin
8378
key: cargo-installed-crates2-ubuntu-latest
8479

8580
- name: Cache cargo registry
86-
uses: actions/cache@v1
81+
uses: actions/cache@v3
8782
with:
8883
path: ~/.cargo/registry
8984
key: ${{ runner.os }}-cargo-registry2-${{ hashFiles('**/Cargo.lock') }}
9085

9186
- name: Cache cargo index
92-
uses: actions/cache@v1
87+
uses: actions/cache@v3
9388
with:
9489
path: ~/.cargo/git
9590
key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
9691

9792
- name: Cache cargo target dir
98-
uses: actions/cache@v1.1.2
93+
uses: actions/cache@v3
9994
with:
10095
path: target
10196
key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('rust-toolchain') }}
10297

10398
- name: Cache rust repository
10499
# We only clone the rust repository for rustc tests
105100
if: ${{ contains(matrix.commands, 'rustc') }}
106-
uses: actions/cache@v2
101+
uses: actions/cache@v3
107102
id: cache-rust-repository
108103
with:
109104
path: rust
@@ -140,5 +135,5 @@ jobs:
140135
duplicates:
141136
runs-on: ubuntu-latest
142137
steps:
143-
- uses: actions/checkout@v2
138+
- uses: actions/checkout@v3
144139
- run: python tools/check_intrinsics_duplicates.py

.github/workflows/release.yml

+6-11
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
- { gcc: "libgccjit.so", artifacts_branch: "master" }
2323

2424
steps:
25-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v3
2626

27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v3
2828
with:
2929
repository: llvm/llvm-project
3030
path: llvm
@@ -58,31 +58,26 @@ jobs:
5858
- name: Set RUST_COMPILER_RT_ROOT
5959
run: echo "RUST_COMPILER_RT_ROOT="${{ env.workspace }}/llvm/compiler-rt >> $GITHUB_ENV
6060

61-
# https://github.com/actions/cache/issues/133
62-
- name: Fixup owner of ~/.cargo/
63-
# Don't remove the trailing /. It is necessary to follow the symlink.
64-
run: sudo chown -R $(whoami):$(id -ng) ~/.cargo/
65-
6661
- name: Cache cargo installed crates
67-
uses: actions/cache@v1.1.2
62+
uses: actions/cache@v3
6863
with:
6964
path: ~/.cargo/bin
7065
key: cargo-installed-crates2-ubuntu-latest
7166

7267
- name: Cache cargo registry
73-
uses: actions/cache@v1
68+
uses: actions/cache@v3
7469
with:
7570
path: ~/.cargo/registry
7671
key: ${{ runner.os }}-cargo-registry2-${{ hashFiles('**/Cargo.lock') }}
7772

7873
- name: Cache cargo index
79-
uses: actions/cache@v1
74+
uses: actions/cache@v3
8075
with:
8176
path: ~/.cargo/git
8277
key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
8378

8479
- name: Cache cargo target dir
85-
uses: actions/cache@v1.1.2
80+
uses: actions/cache@v3
8681
with:
8782
path: target
8883
key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('rust-toolchain') }}

0 commit comments

Comments
 (0)