Skip to content

Commit ec18a4d

Browse files
committed
workflows: Fix the Linux container build
1 parent 3a7b846 commit ec18a4d

File tree

3 files changed

+37
-28
lines changed

3 files changed

+37
-28
lines changed

.github/workflows/build-linux.yaml

+24-18
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,20 @@ jobs:
1414

1515
steps:
1616
- uses: actions/checkout@v2
17-
# Our linux container does have git >= 2.18 installed, so we can't use submodules here.
18-
# with:
19-
# submodules: true
17+
with:
18+
submodules: true
2019

21-
#- name: Get submodules
22-
# run: git submodule update --init --depth 1
20+
- name: Prepare Rustup
21+
run: (cd /github/home && ln -s /root/.cargo)
2322

24-
- name: Install Rust
25-
uses: hecrj/setup-rust-action@master
26-
with:
27-
rust-version: stable
23+
- name: Update Rustup
24+
run: rustup self update
25+
26+
- name: Update Rust
27+
run: rustup update
28+
29+
- name: Configure Rust Toolchain
30+
run: rustup default stable
2831

2932
- name: Install Clippy
3033
run: rustup component add clippy
@@ -57,17 +60,20 @@ jobs:
5760

5861
steps:
5962
- uses: actions/checkout@v2
60-
# Our linux container does have git >= 2.18 installed, so we can't use submodules here.
61-
# with:
62-
# submodules: true
63+
with:
64+
submodules: true
6365

64-
#- name: Get submodules
65-
# run: git submodule update --init --depth 1
66+
- name: Prepare Rustup
67+
run: (cd /github/home && ln -s /root/.cargo)
6668

67-
- name: Install Rust
68-
uses: hecrj/setup-rust-action@master
69-
with:
70-
rust-version: beta
69+
- name: Update Rustup
70+
run: rustup self update
71+
72+
- name: Update Rust
73+
run: rustup update
74+
75+
- name: Configure Rust Toolchain
76+
run: rustup default beta
7177

7278
- name: Install Clippy
7379
run: rustup component add clippy

.github/workflows/fmt.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'Rust Skia - Check Formatting'
1+
name: 'Check Formatting'
22
on: [push]
33

44
jobs:

mk-workflows/src/templates/linux-job.yaml

+12-9
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,20 @@ container: ghcr.io/pragmatrix/rust-skia-linux:latest
33

44
steps:
55
- uses: actions/checkout@v2
6-
# Our linux container does have git >= 2.18 installed, so we can't use submodules here.
7-
# with:
8-
# submodules: true
6+
with:
7+
submodules: true
98

10-
#- name: Get submodules
11-
# run: git submodule update --init --depth 1
9+
- name: Prepare Rustup
10+
run: (cd /github/home && ln -s /root/.cargo)
1211

13-
- name: Install Rust
14-
uses: hecrj/setup-rust-action@master
15-
with:
16-
rust-version: $[[rustToolchain]]
12+
- name: Update Rustup
13+
run: rustup self update
14+
15+
- name: Update Rust
16+
run: rustup update
17+
18+
- name: Configure Rust Toolchain
19+
run: rustup default $[[rustToolchain]]
1720

1821
- name: Install Clippy
1922
run: rustup component add clippy

0 commit comments

Comments
 (0)