introduce an env.rust_release workflow environment variable - this is…

… to set stable/nightly per workflow
conjure-cp · Nov 22, 2023 · 3bdcea3 · 3bdcea3
1 parent 59c2e57
commit 3bdcea3
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 56 deletions.
diff --git a/.github/workflows/chuffed.yml b/.github/workflows/chuffed.yml
@@ -17,6 +17,8 @@ on:
  - Cargo.*
  - .github/workflows/chuffed.yml
 
+env:
+ rust_release: stable
 
 jobs:
  ubuntu:
@@ -36,11 +38,11 @@ jobs:
  target/ 
  solvers/chuffed/vendor
 
- key: ${{ runner.os }}-stable-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-stable-
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}-
 
  - working-directory: ./solvers/chuffed
- run: rustup update stable && rustup default stable
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - working-directory: ./solvers/chuffed
  run: cargo build -vv
@@ -62,11 +64,11 @@ jobs:
  target/ 
  solvers/chuffed/vendor
 
- key: ${{ runner.os }}-stable-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-stable-
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}-
 
  - working-directory: ./solvers/chuffed
- run: rustup update stable && rustup default stable
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - working-directory: ./solvers/chuffed
  run: rustup target add aarch64-apple-darwin
@@ -91,11 +93,11 @@ jobs:
  target/ 
  solvers/chuffed/vendor
 
- key: ${{ runner.os }}-stable-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-stable-
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}-
 
  - working-directory: ./solvers/chuffed
- run: rustup update stable && rustup default stable
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - working-directory: ./solvers/chuffed
  run: cargo test
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -17,6 +17,8 @@ on:
  - .github/actions/code-coverage.yml
  workflow_dispatch:
 
+env:
+ rust_release: nightly
 
 jobs:
  coverage:
@@ -51,12 +53,12 @@ jobs:
  solvers/minion/vendor
  solvers/chuffed/vendor
 
- key: ${{ runner.os }}-nightly-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-nightly
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}
 
- - name: Install rust nightly
+ - name: Install rust ${{ env.rust_release }}
  working-directory: ./solvers/minion
- run: rustup update nightly && rustup default nightly
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - name: Generate coverage reports
  working-directory: .

diff --git a/.github/workflows/doc-coverage.yml b/.github/workflows/doc-coverage.yml
@@ -17,6 +17,9 @@ on:
  - .github/actions/doc-coverage.yml
  workflow_dispatch:
 
+env:
+ rust_release: nightly
+
 jobs:
  minion:
  name: 'Info: Minion Docs Coverage Report'
@@ -35,11 +38,11 @@ jobs:
  target/ 
  solvers/minion/vendor
 
- key: ${{ runner.os }}-nightly-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-nightly
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}
 
- - name: Use nightly 
- run: rustup update nightly && rustup default nightly
+ - name: Use ${{ env.rust_release }} 
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - name: Coverage Report
  working-directory: ./solvers/minion
@@ -65,11 +68,11 @@ jobs:
  target/ 
  solvers/chuffed/vendor
 
- key: ${{ runner.os }}-nightly-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-nightly
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}
 
- - name: Use nightly 
- run: rustup update nightly && rustup default nightly
+ - name: Use ${{ env.rust_release }} 
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - name: Coverage Report
  working-directory: ./solvers/chuffed
@@ -96,11 +99,11 @@ jobs:
  solvers/chuffed/vendor
  solvers/minion/vendor
 
- key: ${{ runner.os }}-nightly-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-nightly
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}
 
- - name: Use nightly 
- run: rustup update nightly && rustup default nightly
+ - name: Use ${{ env.rust_release }} 
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - name: Coverage Report
  working-directory: ./conjure_oxide

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -6,6 +6,9 @@ on:
  - main # run for pushes to the main branch
  workflow_dispatch:
 
+env:
+ rust_release: stable
+
 jobs:
  coverage:
  name: "Generate Documentation"
@@ -37,11 +40,11 @@ jobs:
  solvers/minion/vendor
  solvers/chuffed/vendor
 
- key: ${{ runner.os }}-stable-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-stable-
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}-
 
- - name: Install rust stable
- run: rustup update stable && rustup default stable
+ - name: Install rust ${{ env.rust_release }}
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - name: Generate documentation
  working-directory: .

diff --git a/.github/workflows/kissat.yml b/.github/workflows/kissat.yml
@@ -17,6 +17,9 @@ on:
  - .github/workflows/kissat.yml
  workflow_dispatch:
 
+env:
+ rust_release: stable
+
 jobs:
  ubuntu:
  name: 'Kissat: Ubuntu Build'
@@ -34,11 +37,11 @@ jobs:
  ~/.cargo/git/db/
  target/
 
- key: ${{ runner.os }}-stable-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-stable-
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}-
 
  - working-directory: ./solvers/kissat
- run: rustup update stable && rustup default stable
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - working-directory: ./solvers/kissat
  run: cargo build -vv
@@ -59,11 +62,11 @@ jobs:
  ~/.cargo/git/db/
  target/
 
- key: ${{ runner.os }}-stable-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-stable-
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}-
 
  - working-directory: ./solvers/kissat
- run: rustup update stable && rustup default stable
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - working-directory: ./solvers/kissat 
  run: rustup target add aarch64-apple-darwin
@@ -87,11 +90,11 @@ jobs:
  ~/.cargo/git/db/
  target/
 
- key: ${{ runner.os }}-stable-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-stable-
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}-
 
  - working-directory: ./solvers/kissat
- run: rustup update stable && rustup default stable
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - working-directory: ./solvers/kissat
  run: cargo test
diff --git a/.github/workflows/minion.yml b/.github/workflows/minion.yml
@@ -15,6 +15,9 @@ on:
  - .github/workflows/minion.yml
  workflow_dispatch:
 
+env:
+ rust_release: stable
+
 jobs:
  ubuntu:
  name: "Minion: Ubuntu Build"
@@ -33,11 +36,11 @@ jobs:
  target/ 
  solvers/minion/vendor
 
- key: ${{ runner.os }}-stable-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-stable-
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}-
 
  - working-directory: ./solvers/minion
- run: rustup update stable && rustup default stable
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - working-directory: ./solvers/minion
  run: cargo build -vv
@@ -59,11 +62,11 @@ jobs:
  target/ 
  solvers/minion/vendor
 
- key: ${{ runner.os }}-stable-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-stable-
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}-
 
  - working-directory: ./solvers/minion
- run: rustup update stable && rustup default stable
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - working-directory: ./solvers/minion 
  run: rustup target add aarch64-apple-darwin
@@ -87,11 +90,11 @@ jobs:
  ~/.cargo/git/db/
  target/ 
  solvers/minion/vendor
- key: ${{ runner.os }}-stable-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-stable-
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}-
 
  - working-directory: ./solvers/minion
- run: rustup update stable && rustup default stable
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - working-directory: ./solvers/minion
  run: cargo test

diff --git a/.github/workflows/oxide.yml b/.github/workflows/oxide.yml
@@ -15,6 +15,9 @@ on:
  - .github/workflows/oxide.yml
  workflow_dispatch:
 
+env:
+ rust_release: stable
+
 jobs:
  ubuntu:
  name: "Conjure Oxide: Ubuntu Build"
@@ -34,11 +37,11 @@ jobs:
  solvers/minion/vendor
  solvers/chuffed/vendor
 
- key: ${{ runner.os }}-stable-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-stable-
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}-
 
  - working-directory: ./conjure_oxide
- run: rustup update stable && rustup default stable
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - working-directory: ./conjure_oxide
  run: cargo build -vv
@@ -61,11 +64,11 @@ jobs:
  solvers/minion/vendor
  solvers/chuffed/vendor
 
- key: ${{ runner.os }}-stable-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-stable-
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}-
 
  - working-directory: ./conjure_oxide
- run: rustup update stable && rustup default stable
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - working-directory: ./conjure_oxide
  run: rustup target add aarch64-apple-darwin
@@ -90,11 +93,11 @@ jobs:
  target/ 
  solvers/minion/vendor
  solvers/chuffed/vendor
- key: ${{ runner.os }}-stable-${{ github.event.repository.updated_at }}
- restore-keys: ${{ runner.os }}-stable-
+ key: ${{ runner.os }}-${{ env.rust_release }}-${{ github.event.repository.updated_at }}
+ restore-keys: ${{ runner.os }}-${{ env.rust_release }}-
 
  - working-directory: ./conjure_oxide
- run: rustup update stable && rustup default stable
+ run: rustup update ${{ env.rust_release }} && rustup default ${{ env.rust_release }}
 
  - working-directory: ./conjure_oxide
  run: |