diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 0a8ece8..df59291 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -50,18 +50,13 @@ jobs: cd .. sudo ldconfig - - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal + + - name: Install stable minimal toolchain + uses: dtolnay/rust-toolchain@v1 + with: toolchain: stable - override: true - components: llvm-tools - - - name: Install cargo-llvm-cov - run: cargo install cargo-llvm-cov - + components: llvm-tools,cargo-llvm-cov + - name: Set up Python 3.12 uses: actions/setup-python@v4 with: diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 303444e..f58ec36 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -29,21 +29,21 @@ jobs: if: ${{ startsWith(matrix.os, 'macOS') }} run: | brew install automake autoconf - - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true + + - name: Install stable, minimal toolchain + uses: dtolnay/rust-toolchain@v1 + with: + toolchain: stable - name: Add Python 3.8 + if: ${{ matrix.os != 'macOS-14' }} uses: actions/setup-python@v5 continue-on-error: true with: python-version: "3.8" - name: Add Python 3.9 + if: ${{ matrix.os != 'macOS-14' }} uses: actions/setup-python@v5 continue-on-error: true with: @@ -99,7 +99,13 @@ jobs: # determine which target cpus for rustc to build for from machine type export ARCH="$(uname -m)" case $ARCH in - x86_64) export TARGETS="x86-64 x86-64-v2 x86-64-v3" ;; + x86_64) + if [[ "$OSTYPE" == "linux-gnu"* ]]; then + export TARGETS="x86-64 x86-64-v2 x86-64-v3" + else + export TARGETS="x86-64" + fi + ;; arm64) export TARGETS="apple-m1" ;; *) echo "unknown arch (uname -m) $ARCH"; exit 1 ;; esac @@ -146,17 +152,17 @@ jobs: needs: [build-release] steps: - name: Download Linux artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ubuntu-latest.tar.gz - name: Download MacOS arm64 artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: macOS-14.tar.gz - name: Download MacOS x86_64 artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: macOS-latest.tar.gz diff --git a/.github/workflows/run_python_tests.yml b/.github/workflows/run_python_tests.yml index da85021..eaec41c 100644 --- a/.github/workflows/run_python_tests.yml +++ b/.github/workflows/run_python_tests.yml @@ -35,12 +35,10 @@ jobs: run: | brew install automake autoconf - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true + - name: Install stable minimal toolchain + uses: dtolnay/rust-toolchain@v1 + with: + toolchain: stable - name: install cfitsio env: diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 5f8bf00..b84491c 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -29,12 +29,10 @@ jobs: run: | brew install automake autoconf - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal + - name: Install stable minimal toolchain + uses: dtolnay/rust-toolchain@v1 + with: toolchain: stable - override: true - name: install cfitsio env: