From 1932773e3b2bb13af7f76146a9c262ee3f929747 Mon Sep 17 00:00:00 2001 From: Sebastian Imlay Date: Fri, 5 Apr 2024 00:07:04 -0400 Subject: [PATCH 1/2] Minor updates to ci --- .github/workflows/coreaudio-sys.yml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/coreaudio-sys.yml b/.github/workflows/coreaudio-sys.yml index 2dade6b..c923c25 100644 --- a/.github/workflows/coreaudio-sys.yml +++ b/.github/workflows/coreaudio-sys.yml @@ -9,8 +9,10 @@ jobs: toolchain: [stable, nightly] steps: - uses: actions/checkout@v4 - - name: Install llvm and clang - run: brew install llvm + - name: Install LLVM and Clang + uses: KyleMayes/install-llvm-action@v2.0.1 + with: + version: "15.0" - name: Install stable uses: actions-rs/toolchain@v1 with: @@ -25,7 +27,7 @@ jobs: run: cargo test --all-features --verbose ios-check: - runs-on: macOS-latest + runs-on: macOS-14 strategy: matrix: toolchain: [stable, nightly] @@ -42,7 +44,7 @@ jobs: - name: Install LLVM and Clang uses: KyleMayes/install-llvm-action@v2.0.1 with: - version: "13.0" + version: "15.0" - name: add ios targets run: rustup target add ${{matrix.target}} @@ -55,8 +57,10 @@ jobs: runs-on: macOS-latest steps: - uses: actions/checkout@v4 - - name: Install llvm and clang - run: brew install llvm + - name: Install LLVM and Clang + uses: KyleMayes/install-llvm-action@v2.0.1 + with: + version: "15.0" - name: Install stable uses: actions-rs/toolchain@v1 with: @@ -75,8 +79,10 @@ jobs: runs-on: macOS-latest steps: - uses: actions/checkout@v4 - - name: Install llvm and clang - run: brew install llvm + - name: Install LLVM and Clang + uses: KyleMayes/install-llvm-action@v2.0.1 + with: + version: "15.0" - name: Install stable uses: actions-rs/toolchain@v1 with: From 824fbbb6a222070df1967df3c3decc76c235b021 Mon Sep 17 00:00:00 2001 From: Sebastian Imlay Date: Fri, 5 Apr 2024 11:04:30 -0400 Subject: [PATCH 2/2] Update rust install github action --- .github/workflows/coreaudio-sys.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/coreaudio-sys.yml b/.github/workflows/coreaudio-sys.yml index c923c25..fce8814 100644 --- a/.github/workflows/coreaudio-sys.yml +++ b/.github/workflows/coreaudio-sys.yml @@ -13,12 +13,9 @@ jobs: uses: KyleMayes/install-llvm-action@v2.0.1 with: version: "15.0" - - name: Install stable - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: - profile: minimal toolchain: ${{ matrix.toolchain }} - override: true - name: cargo test run: cargo test --verbose - name: cargo test - no features @@ -34,12 +31,10 @@ jobs: target: [aarch64-apple-ios, x86_64-apple-ios, aarch64-apple-ios-sim] steps: - uses: actions/checkout@v4 - - name: Install stable rust toolchain - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: - profile: minimal toolchain: ${{ matrix.toolchain }} - override: true + targets: ${{ matrix.target }} - name: Install LLVM and Clang uses: KyleMayes/install-llvm-action@v2.0.1 @@ -61,12 +56,9 @@ jobs: uses: KyleMayes/install-llvm-action@v2.0.1 with: version: "15.0" - - name: Install stable - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: - profile: minimal toolchain: stable - override: true - name: cargo doc - all features run: cargo doc --all-features --verbose @@ -83,12 +75,9 @@ jobs: uses: KyleMayes/install-llvm-action@v2.0.1 with: version: "15.0" - - name: Install stable - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: - profile: minimal toolchain: stable - override: true - name: cargo publish continue-on-error: true run: cargo publish --token $CRATESIO_TOKEN