From 888b5084856d2f6c5c3e7e4b0ebce3c2477fc963 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Wed, 25 Jan 2023 17:22:26 +0100 Subject: [PATCH 1/3] Swap out the deprecated actions-rs/toolchain --- .github/workflows/build.yml | 15 +++++---------- .github/workflows/docs.yml | 10 +++------- .github/workflows/test.yml | 10 ++-------- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3f4e3a18..b918a9fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,17 +57,12 @@ jobs: key: ${{ matrix.name }}-${{ matrix.cross-target }} - name: Set up Rust toolchain - uses: actions-rs/toolchain@v1 + # Needed for SIMD + uses: dtolnay/rust-toolchain@nightly with: - # FIXME: Needed for SIMD. Diopser can be compiled without SIMD support - # though, we'd actually need to test whether both versions - # compile - toolchain: nightly - profile: minimal - default: true - # The macOS AArch64/universal build is done from an x86_64 macOS CI - # runner, so it needs to be cross compiled - target: ${{ matrix.cross-target }} + # The macOS AArch64 build is done from an x86_64 macOS CI runner, so + # it needs to be cross compiled + targets: ${{ matrix.cross-target }} - name: Package all targets from bundler.toml # Instead of hardcoding which targets to build and package, we'll # package everything that's got en entry in the `bundler.toml` file diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index daa5e01a..ebe845b3 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -45,13 +45,9 @@ jobs: key: ${{ matrix.name }}-${{ matrix.cross-target }} - name: Set up Rust toolchain - uses: actions-rs/toolchain@v1 - with: - # Nightly is needed to document the SIMD feature and for the - # `doc_auto_cfg` feature - toolchain: nightly - profile: minimal - default: true + # Nightly is needed to document the SIMD feature and for the + # `doc_auto_cfg` feature + uses: dtolnay/rust-toolchain@nightly - name: Build all targets uses: actions-rs/cargo@v1 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 314bfe0d..69c4ce54 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,14 +50,8 @@ jobs: key: ${{ matrix.name }}-${{ matrix.cross-target }} - name: Set up Rust toolchain - uses: actions-rs/toolchain@v1 - with: - # FIXME: Needed for SIMD. Diopser can be compiled without SIMD support - # though, we'd actually need to test whether both versions - # compile - toolchain: nightly - profile: minimal - default: true + # Needed for SIMD + uses: dtolnay/rust-toolchain@nightly - name: Build all targets uses: actions-rs/cargo@v1 with: From 8a62c543078e7785ec2ed68404676482894d0fa7 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Wed, 25 Jan 2023 17:29:50 +0100 Subject: [PATCH 2/3] Update actions to Node 16 versions --- .github/workflows/build.yml | 8 ++++---- .github/workflows/docs.yml | 6 +++--- .github/workflows/test.yml | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b918a9fb..5d56aef1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: name: Package plugin binaries runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Fetch all git history run: git fetch --force --prune --tags --unshallow @@ -37,7 +37,7 @@ jobs: sudo apt-get update sudo apt-get install -y libasound2-dev libgl-dev libjack-dev libxcb1-dev libxcb-icccm4-dev libxcursor-dev libxkbcommon-dev libxcb-shape0-dev libxcb-xfixes0-dev - - uses: actions/cache@v2 + - uses: actions/cache@v3 # FIXME: Caching `target/` causes the Windows runner to blow up after some time if: startsWith(matrix.os, 'windows') with: @@ -46,7 +46,7 @@ jobs: ~/.cargo/registry/cache/ ~/.cargo/git/db/ key: ${{ matrix.name }}-${{ matrix.cross-target }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 if: "!startsWith(matrix.os, 'windows')" with: path: | @@ -96,7 +96,7 @@ jobs: mv target/bundled/* "$ARCHIVE_NAME/$ARCHIVE_NAME" - name: Add an OS-specific readme file with installation instructions run: cp ".github/workflows/readme-${{ runner.os }}.txt" "$ARCHIVE_NAME/$ARCHIVE_NAME/README.txt" - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: ${{ env.ARCHIVE_NAME }} path: ${{ env.ARCHIVE_NAME }} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index ebe845b3..91f421f0 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -15,7 +15,7 @@ jobs: name: Build and test all components runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Needed for git-describe to do anything useful - name: Fetch all git history run: git fetch --force --prune --tags --unshallow @@ -25,7 +25,7 @@ jobs: sudo apt-get update sudo apt-get install -y libasound2-dev libgl-dev libjack-dev libxcb1-dev libxcb-icccm4-dev libxcursor-dev libxkbcommon-dev libxcb-shape0-dev libxcb-xfixes0-dev - - uses: actions/cache@v2 + - uses: actions/cache@v3 # FIXME: Caching `target/` causes the Windows runner to blow up after some time if: startsWith(matrix.os, 'windows') with: @@ -34,7 +34,7 @@ jobs: ~/.cargo/registry/cache/ ~/.cargo/git/db/ key: ${{ matrix.name }}-${{ matrix.cross-target }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 if: "!startsWith(matrix.os, 'windows')" with: path: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 69c4ce54..2145d18a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: name: Build and test all components runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Needed for git-describe to do anything useful - name: Fetch all git history run: git fetch --force --prune --tags --unshallow @@ -30,7 +30,7 @@ jobs: sudo apt-get update sudo apt-get install -y libasound2-dev libgl-dev libjack-dev libxcb1-dev libxcb-icccm4-dev libxcursor-dev libxkbcommon-dev libxcb-shape0-dev libxcb-xfixes0-dev - - uses: actions/cache@v2 + - uses: actions/cache@v3 # FIXME: Caching `target/` causes the Windows runner to blow up after some time if: startsWith(matrix.os, 'windows') with: @@ -39,7 +39,7 @@ jobs: ~/.cargo/registry/cache/ ~/.cargo/git/db/ key: ${{ matrix.name }}-${{ matrix.cross-target }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 if: "!startsWith(matrix.os, 'windows')" with: path: | From 636521090ee860f4abf057b6b66a600b5fdb5faa Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Wed, 25 Jan 2023 17:35:31 +0100 Subject: [PATCH 3/3] Replace uses of unmaintained actions-rs/cargo --- .github/workflows/docs.yml | 15 ++++++--------- .github/workflows/test.yml | 14 +++----------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 91f421f0..50ebcb52 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -48,15 +48,12 @@ jobs: # Nightly is needed to document the SIMD feature and for the # `doc_auto_cfg` feature uses: dtolnay/rust-toolchain@nightly - - name: Build all targets - uses: actions-rs/cargo@v1 - with: - command: doc - # Don't use --all-features here as that will enable a whole bunch of - # conflicting iced features. We also don't want to use `--workspace` - # here because that would also document our plugins and binary crates. - args: >- - --features docs,simd,standalone,zstd --no-deps + - name: Generate documentation for all targets + # Don't use --all-features here as that will enable a whole bunch of + # conflicting iced features. We also don't want to use `--workspace` + # here because that would also document our plugins and binary crates. + run: >- + cargo doc --features docs,simd,standalone,zstd --no-deps -p nih_plug -p nih_plug_derive -p nih_plug_egui diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2145d18a..5b98cc25 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -52,15 +52,7 @@ jobs: - name: Set up Rust toolchain # Needed for SIMD uses: dtolnay/rust-toolchain@nightly - - name: Build all targets - uses: actions-rs/cargo@v1 - with: - command: build - # Don't use --all-features as that will enable a whole bunch of - # conflicting iced features - args: --workspace --features "simd,standalone,zstd" - name: Run the tests - uses: actions-rs/cargo@v1 - with: - command: test - args: --workspace + # Don't use --all-features as that will enable a whole bunch of + # conflicting iced features + run: cargo test --workspace --features "simd,standalone,zstd"