Attempt to fix release CI

MWATelescope · May 13, 2024 · abefea6 · abefea6
1 parent f3fcbd5
commit abefea6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh
@@ -6,12 +6,7 @@ set -eux
 # release tarballs.
 cp .github/workflows/releases-readme.md README.md
 
-if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    source /root/.cargo/env
-
-    rustup install 1.70 --no-self-update
-    rustup default 1.70
-
+if [[ "$OSTYPE" == "linux-gnu"* ]]; then    
     # Build a release for each x86_64 microarchitecture level. v4 can't be
     # compiled on GitHub for some reason.
     for level in "x86-64" "x86-64-v2" "x86-64-v3"; do

diff --git a/.github/workflows/releases.yaml b/.github/workflows/releases.yaml
@@ -21,11 +21,13 @@ jobs:
       with:
         fetch-depth: 0
 
+    - name: Install Rust, stable minimal toolchain
+      uses: dtolnay/rust-toolchain@v1
+      with:          
+        toolchain: stable
+
     - name: Build
-      uses: docker://konstin2/maturin:latest
-      with:
-        entrypoint: /bin/bash
-        args: .github/workflows/build.sh
+      run: .github/workflows/build.sh
 
     - name: Upload tarball
       uses: actions/upload-artifact@v2
@@ -44,10 +46,10 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install Rust, minimal toolchain
+    - name: Install Rust, stable minimal toolchain
       uses: dtolnay/rust-toolchain@v1
       with:          
-        toolchain: 1.70
+        toolchain: stable
 
     - name: Build
       run: .github/workflows/build.sh
@@ -69,10 +71,10 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install Rust, minimal toolchain
+    - name: Install Rust, stable minimal toolchain
       uses: dtolnay/rust-toolchain@v1
       with:          
-        toolchain: 1.70
+        toolchain: stable
 
     - name: Build
       run: .github/workflows/build.sh