workflows: Fix the Linux container build

pragmatrix · Jun 12, 2021 · 3788dd0 · 3788dd0
1 parent 3a7b846
commit 3788dd0
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 12 deletions.
diff --git a/.github/workflows/build-linux.yaml b/.github/workflows/build-linux.yaml
@@ -21,10 +21,17 @@ jobs:
     #- name: Get submodules
     #  run: git submodule update --init --depth 1
 
-    - name: Install Rust
-      uses: hecrj/setup-rust-action@master
-      with:
-        rust-version: stable
+    - name: Prepare Rustup
+      run: (cd /github/home && ln -s /root/.cargo)
+
+    - name: Update Rustup
+      run: rustup self update
+
+    - name: Update Rust
+      run: rustup update
+
+    - name: Configure Rust Toolchain
+      run: rustup default stable
 
     - name: Install Clippy
       run: rustup component add clippy
@@ -64,10 +71,17 @@ jobs:
     #- name: Get submodules
     #  run: git submodule update --init --depth 1
 
-    - name: Install Rust
-      uses: hecrj/setup-rust-action@master
-      with:
-        rust-version: beta
+    - name: Prepare Rustup
+      run: (cd /github/home && ln -s /root/.cargo)
+
+    - name: Update Rustup
+      run: rustup self update
+
+    - name: Update Rust
+      run: rustup update
+
+    - name: Configure Rust Toolchain
+      run: rustup default beta
 
     - name: Install Clippy
       run: rustup component add clippy

diff --git a/mk-workflows/src/templates/linux-job.yaml b/mk-workflows/src/templates/linux-job.yaml
@@ -10,10 +10,17 @@ steps:
 #- name: Get submodules
 #  run: git submodule update --init --depth 1
 
-- name: Install Rust
-  uses: hecrj/setup-rust-action@master
-  with:
-    rust-version: $[[rustToolchain]]
+- name: Prepare Rustup
+  run: (cd /github/home && ln -s /root/.cargo)
+
+- name: Update Rustup
+  run: rustup self update
+
+- name: Update Rust
+  run: rustup update
+
+- name: Configure Rust Toolchain
+  run: rustup default $[[rustToolchain]]
 
 - name: Install Clippy
   run: rustup component add clippy