Run semver-chesk on stable (#66)

ia0 · May 13, 2023 · 39bfd68 · 39bfd68
1 parent 24af65d
commit 39bfd68
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,6 @@ jobs:
       - uses: actions/checkout@v3
       - run: rustup install nightly
       - run: rustup component add --toolchain=nightly clippy miri rustfmt
-      - run: cargo +nightly install cargo-semver-checks
       - name: cd lib && cargo +nightly fmt -- --check
         run: cargo +nightly fmt -- --check
         working-directory: lib
@@ -139,15 +138,6 @@ jobs:
         run: cargo +nightly bench
         working-directory: lib
       - run: cd bin && ./bench.sh +nightly
-      - name: cd lib && cargo +nightly semver-checks check-release
-        run: cargo +nightly semver-checks check-release
-        working-directory: lib
-      - name: cd lib/macro/internal && cargo +nightly semver-checks check-release
-        run: cargo +nightly semver-checks check-release
-        working-directory: lib/macro/internal
-      - name: cd lib/macro && cargo +nightly semver-checks check-release
-        run: cargo +nightly semver-checks check-release
-        working-directory: lib/macro
       - name: cd lib && cargo +nightly audit --deny=warnings
         run: cargo +nightly audit --deny=warnings
         working-directory: lib
@@ -173,6 +163,7 @@ jobs:
         run: cargo +nightly audit --deny=warnings
         working-directory: www
       - run: rustup install stable
+      - run: cargo +stable install cargo-semver-checks
       - name: cd lib && cargo +stable build
         run: cargo +stable build
         working-directory: lib
@@ -209,6 +200,15 @@ jobs:
       - name: cd bin && cargo +stable build --release
         run: cargo +stable build --release
         working-directory: bin
+      - name: cd lib && cargo +stable semver-checks check-release
+        run: cargo +stable semver-checks check-release
+        working-directory: lib
+      - name: cd lib/macro/internal && cargo +stable semver-checks check-release
+        run: cargo +stable semver-checks check-release
+        working-directory: lib/macro/internal
+      - name: cd lib/macro && cargo +stable semver-checks check-release
+        run: cargo +stable semver-checks check-release
+        working-directory: lib/macro
       - run: rustup install 1.47
       - name: cd lib && cargo +1.47 build
         run: cargo +1.47 build

diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -433,6 +433,8 @@ impl Actions {
         // Check everything on ubuntu nightly.
         for task in Task::iter() {
             for dir in Dir::iter() {
+                let os = Os::Ubuntu;
+                let mut toolchain = Toolchain::Nightly;
                 if task == Task::Clippy && matches!(dir, Dir::Cmp | Dir::Www) {
                     // Clippy is currently broken on cmp and www.
                     continue;
@@ -445,12 +447,14 @@ impl Actions {
                     // Bench is only supported for lib and bin.
                     continue;
                 }
-                if task == Task::SemverChecks && (!dir.is_published() || matches!(dir, Dir::Bin)) {
-                    // SemverChecks only makes sense for published library crates.
-                    continue;
+                if task == Task::SemverChecks {
+                    if !dir.is_published() || matches!(dir, Dir::Bin) {
+                        // SemverChecks only makes sense for published library crates.
+                        continue;
+                    }
+                    // SemverChecks only guarantees support for stable.
+                    toolchain = Toolchain::Stable;
                 }
-                let os = Os::Ubuntu;
-                let toolchain = Toolchain::Nightly;
                 actions.insert(Action { os, toolchain, task, dir });
             }
         }