Merge pull request #101 from ozgurakgun/caches

is this better for caching?
conjure-cp · Nov 22, 2023 · cfb1060 · cfb1060
2 parents eeca3bd + 3bdcea3
commit cfb1060
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 226 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:
@@ -25,12 +27,6 @@ jobs:
  steps:
  - uses: actions/checkout@v2
 
- - name: Generate caching variables
- id: cache-vars
- run: |
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)" >> "$GITHUB_OUTPUT"
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)"
-
  - name: Set up cache
  uses: actions/cache@v3
  with:
@@ -42,11 +38,11 @@ jobs:
  target/ 
  solvers/chuffed/vendor
 
- key: stable-${{ runner.os }}-gitmodules-${{ steps.cache-vars.outputs.submodule_sha }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- restore-keys: stable-${{ runner.os }}-gitmodules-
+ 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
@@ -57,12 +53,6 @@ jobs:
  steps:
  - uses: actions/checkout@v2
 
- - name: Generate caching variables
- id: cache-vars
- run: |
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)" >> "$GITHUB_OUTPUT"
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)"
-
  - name: Set up cache
  uses: actions/cache@v3
  with:
@@ -74,11 +64,11 @@ jobs:
  target/ 
  solvers/chuffed/vendor
 
- key: stable-${{ runner.os }}-gitmodules-${{ steps.cache-vars.outputs.submodule_sha }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- restore-keys: stable-${{ runner.os }}-gitmodules-
+ 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
@@ -92,15 +82,6 @@ jobs:
  steps:
  - uses: actions/checkout@v2
 
- - name: Generate caching variables
- id: cache-vars
- run: |
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)" >> "$GITHUB_OUTPUT"
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)"
-
- echo "cache_paths=$(./etc/ci/get_caching_paths.sh)" >> "$GITHUB_OUTPUT"
- echo "cache_paths=$(./etc/ci/get_caching_paths.sh)"
-
  - name: Set up cache
  uses: actions/cache@v3
  with:
@@ -112,11 +93,11 @@ jobs:
  target/ 
  solvers/chuffed/vendor
 
- key: stable-${{ runner.os }}-gitmodules-${{ steps.cache-vars.outputs.submodule_sha }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- restore-keys: stable-${{ runner.os }}-gitmodules-
+ 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:
@@ -28,12 +30,6 @@ jobs:
  - name: Checkout the repository
  uses: actions/checkout@v2
 
- - name: Generate caching variables
- id: cache-vars
- run: |
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)" >> "$GITHUB_OUTPUT"
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)"
-
  - name: Get Sha
  id: sha
  run: |
@@ -57,12 +53,12 @@ jobs:
  solvers/minion/vendor
  solvers/chuffed/vendor
 
- key: nightly-${{ runner.os }}-gitmodules-${{ steps.cache-vars.outputs.submodule_sha }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- restore-keys: nightly-${{ runner.os }}-gitmodules-
+ 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,19 +17,16 @@ on:
  - .github/actions/doc-coverage.yml
  workflow_dispatch:
 
+env:
+ rust_release: nightly
+
 jobs:
  minion:
  name: 'Info: Minion Docs Coverage Report'
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v2
 
- - name: Generate caching variables
- id: cache-vars
- run: |
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)" >> "$GITHUB_OUTPUT"
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)"
-
  - name: Set up cache
  uses: actions/cache@v3
  with:
@@ -41,11 +38,11 @@ jobs:
  target/ 
  solvers/minion/vendor
 
- key: nightly-${{ runner.os }}-gitmodules-${{ steps.cache-vars.outputs.submodule_sha }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- restore-keys: nightly-${{ runner.os }}-gitmodules-
+ 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
@@ -60,12 +57,6 @@ jobs:
  steps:
  - uses: actions/checkout@v2
 
- - name: Generate caching variables
- id: cache-vars
- run: |
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)" >> "$GITHUB_OUTPUT"
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)"
-
  - name: Set up cache
  uses: actions/cache@v3
  with:
@@ -77,11 +68,11 @@ jobs:
  target/ 
  solvers/chuffed/vendor
 
- key: nightly-${{ runner.os }}-gitmodules-${{ steps.cache-vars.outputs.submodule_sha }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- restore-keys: nightly-${{ runner.os }}-gitmodules-
+ 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,12 +87,6 @@ jobs:
  steps:
  - uses: actions/checkout@v2
 
- - name: Generate caching variables
- id: cache-vars
- run: |
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)" >> "$GITHUB_OUTPUT"
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)"
-
  - name: Set up cache
  uses: actions/cache@v3
  with:
@@ -114,11 +99,11 @@ jobs:
  solvers/chuffed/vendor
  solvers/minion/vendor
 
- key: nightly-${{ runner.os }}-gitmodules-${{ steps.cache-vars.outputs.submodule_sha }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- restore-keys: nightly-${{ runner.os }}
+ 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"
@@ -14,12 +17,6 @@ jobs:
  - name: Checkout the repository
  uses: actions/checkout@v2
 
- - name: Generate caching variables
- id: cache-vars
- run: |
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)" >> "$GITHUB_OUTPUT"
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)"
-
  - name: Get Sha
  id: sha
  run: |
@@ -43,11 +40,11 @@ jobs:
  solvers/minion/vendor
  solvers/chuffed/vendor
 
- key: stable-${{ runner.os }}-gitmodules-${{ steps.cache-vars.outputs.submodule_sha }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- restore-keys: stable-${{ runner.os }}-gitmodules-
+ 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,19 +17,16 @@ on:
  - .github/workflows/kissat.yml
  workflow_dispatch:
 
+env:
+ rust_release: stable
+
 jobs:
  ubuntu:
  name: 'Kissat: Ubuntu Build'
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v2
 
- - name: Generate caching variables
- id: cache-vars
- run: |
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)" >> "$GITHUB_OUTPUT"
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)"
-
  - name: Set up cache
  uses: actions/cache@v3
  with:
@@ -40,11 +37,11 @@ jobs:
  ~/.cargo/git/db/
  target/
 
- key: stable-${{ runner.os }}-gitmodules-${{ steps.cache-vars.outputs.submodule_sha }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- restore-keys: stable-${{ runner.os }}-gitmodules-
+ 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
@@ -55,12 +52,6 @@ jobs:
  steps:
  - uses: actions/checkout@v2
 
- - name: Generate caching variables
- id: cache-vars
- run: |
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)" >> "$GITHUB_OUTPUT"
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)"
-
  - name: Set up cache
  uses: actions/cache@v3
  with:
@@ -71,11 +62,11 @@ jobs:
  ~/.cargo/git/db/
  target/
 
- key: stable-${{ runner.os }}-gitmodules-${{ steps.cache-vars.outputs.submodule_sha }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- restore-keys: stable-${{ runner.os }}-gitmodules-
+ 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
@@ -89,12 +80,6 @@ jobs:
  steps:
  - uses: actions/checkout@v2
 
- - name: Generate caching variables
- id: cache-vars
- run: |
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)" >> "$GITHUB_OUTPUT"
- echo -e "submodule_sha=$(./etc/ci/get_submodules_hash.sh)"
-
  - name: Set up cache
  uses: actions/cache@v3
  with:
@@ -105,11 +90,11 @@ jobs:
  ~/.cargo/git/db/
  target/
 
- key: stable-${{ runner.os }}-gitmodules-${{ steps.cache-vars.outputs.submodule_sha }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- restore-keys: stable-${{ runner.os }}-gitmodules-
+ 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