Avoid use of nightly Rust in test-inputs.yml tests.

obi1kenobi · Jul 14, 2024 · e74e439 · e74e439
1 parent 4c4112f
commit e74e439
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 22 deletions.
diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml
@@ -18,7 +18,14 @@ jobs:
         toolchain: ['1.74', 'stable', 'beta']
         experimental: [false]
         include:
-          - toolchain: 'nightly'
+          - os: 'ubuntu-latest'
+            toolchain: 'nightly'
+            experimental: true
+          - os: 'windows-latest'
+            toolchain: 'nightly'
+            experimental: true
+          - os: 'macos-latest'
+            toolchain: 'nightly'
             experimental: true
     continue-on-error: ${{ matrix.experimental }}
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/test-inputs.yml b/.github/workflows/test-inputs.yml
@@ -102,7 +102,7 @@ jobs:
         with:
           package: rio_api, rio_turtle
           feature-group: only-explicit-features
-          feature: generalized
+          features: generalized
 
   test-exclude:
     name: Test input exclude
@@ -271,14 +271,14 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: action
-      - name: Install latest beta
-        uses: dtolnay/rust-toolchain@beta
-      - name: Set local override to beta
-        run: rustup override set beta
-      - name: Run the action with rust-toolchain set to nightly
+      - name: Install latest stable
+        uses: dtolnay/rust-toolchain@stable
+      - name: Set local override to stable
+        run: rustup override set stable
+      - name: Run the action with rust-toolchain set to beta
         uses: ./action/
         with:
-          rust-toolchain: nightly
+          rust-toolchain: beta
       - name: Get cache key
         uses: actions/cache/restore@v4
         id: get-cache-key
@@ -290,14 +290,14 @@ jobs:
           restore-keys: |
             semver-${{ github.job }}
       - name: Fail if the toolchain used by the action is invalid
-        if: ${{ ! contains(steps.get-cache-key.outputs.cache-matched-key, 'nightly') }}
+        if: ${{ ! contains(steps.get-cache-key.outputs.cache-matched-key, 'beta') }}
         run: |
-          echo "The toolchain used by the action should be nightly, but it is not!"
+          echo "The toolchain used by the action should be beta, but it is not!"
           exit 1
       - name: Check the active toolchain
         run: |
-          if ! rustup show active-toolchain | grep -q "beta"; then
-            echo "The active toolchain should be still beta, but it is $(rustup show active-toolchain)!"
+          if ! rustup show active-toolchain | grep -q "stable"; then
+            echo "The active toolchain should be still stable, but it is $(rustup show active-toolchain)!"
             exit 1
           fi
 
@@ -314,14 +314,14 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: action
-      - name: Install latest beta
-        uses: dtolnay/rust-toolchain@beta
-      - name: Set override to beta in rust-toolchain.toml file
-        run: echo -e "[toolchain]\nchannel = \"beta\"" > rust-toolchain.toml
-      - name: Run the action with rust-toolchain set to nightly
+      - name: Install latest stable
+        uses: dtolnay/rust-toolchain@stable
+      - name: Set override to stable in rust-toolchain.toml file
+        run: echo -e "[toolchain]\nchannel = \"stable\"" > rust-toolchain.toml
+      - name: Run the action with rust-toolchain set to beta
         uses: ./action/
         with:
-          rust-toolchain: nightly
+          rust-toolchain: beta
       - name: Get cache key
         uses: actions/cache/restore@v4
         id: get-cache-key
@@ -333,14 +333,14 @@ jobs:
           restore-keys: |
             semver-${{ github.job }}
       - name: Fail if the toolchain used by the action is invalid
-        if: ${{ ! contains(steps.get-cache-key.outputs.cache-matched-key, 'nightly') }}
+        if: ${{ ! contains(steps.get-cache-key.outputs.cache-matched-key, 'beta') }}
         run: |
-          echo "The toolchain used by the action should be nightly, but it is not!"
+          echo "The toolchain used by the action should be beta, but it is not!"
           exit 1
       - name: Check the active toolchain
         run: |
-          if ! rustup show active-toolchain | grep -q "beta"; then
-            echo "The active toolchain should be still beta, but it is $(rustup show active-toolchain)!"
+          if ! rustup show active-toolchain | grep -q "stable"; then
+            echo "The active toolchain should be still stable, but it is $(rustup show active-toolchain)!"
             exit 1
           fi