chore: move cache around (#374)

ipvm-wg · Oct 11, 2023 · edd2f21 · edd2f21
1 parent b0bda83
commit edd2f21
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 73 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -46,19 +46,19 @@ jobs:
         run: sudo apt update && sudo apt install -y musl-dev musl-tools
         if: matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl'
 
-      - name: Cache Project
-        uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-          shared-key: check-${{ matrix.target }}-${{ matrix.os }}
-
       - name: Install Rust Toolchain
         id: toolchain
         uses: dtolnay/rust-toolchain@stable
 
       - name: Override rust-toolchain.toml
         run: rustup override set ${{steps.toolchain.outputs.name}}
 
+      - name: Cache Project
+        uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+          shared-key: check-${{ matrix.target }}-${{ matrix.os }}
+
       - name: cross-build
         uses: taiki-e/setup-cross-toolchain-action@v1
         with:
@@ -88,12 +88,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Cache Project
-        uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-          shared-key: check-${{ env.LINUX_TARGET }}-ubuntu-latest
-
       - name: Install musl-tools
         run: sudo apt update && sudo apt install -y musl-dev musl-tools
 
@@ -107,6 +101,12 @@ jobs:
         with:
           tool: cargo-generate-rpm
 
+      - name: Cache Project
+        uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+          shared-key: check-${{ env.LINUX_TARGET }}-ubuntu-latest
+
       - name: Create .deb
         run: cargo deb -p homestar-runtime --target ${{env.LINUX_TARGET}}
 

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -53,15 +53,6 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Cache Project
-        uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-          save-if: ${{ github.event_name == 'push' }}
-
-      - name: Sccache
-        uses: mozilla-actions/[email protected]
-
       - name: Use mold-linker
         uses: rui314/setup-mold@v1
 
@@ -72,6 +63,15 @@ jobs:
       - name: Override rust-toolchain.toml
         run: rustup override set ${{steps.toolchain.outputs.name}}
 
+      - name: Cache Project
+        uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+          save-if: ${{ github.event_name == 'push' }}
+
+      - name: Sccache
+        uses: mozilla-actions/[email protected]
+
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -44,16 +44,11 @@ jobs:
           fetch-depth: 0
           token: ${{ steps.generate-token.outputs.token }}
 
-      - name: Cache Project
-        uses: Swatinem/rust-cache@v2
-
       - name: Install Rust Toolchain
         uses: dtolnay/rust-toolchain@stable
 
-      - name: Verify Publishing of crates
-        uses: katyo/publish-crates@v2
-        with:
-          dry-run: true
+      - name: Cache Project
+        uses: Swatinem/rust-cache@v2
 
       - name: Run release-plz
         uses: MarcoIeni/[email protected]

diff --git a/.github/workflows/tests_and_checks.yml b/.github/workflows/tests_and_checks.yml
@@ -60,18 +60,6 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      # Smarter caching action, speeds up build times compared to regular cache:
-      # https://github.com/Swatinem/rust-cache
-      - name: Cache Project
-        uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-          shared-key: check-${{ matrix.rust-toolchain }}-${{ matrix.os }}
-          save-if: ${{ github.event_name == 'push' }}
-
-      - name: Sccache
-        uses: mozilla-actions/[email protected]
-
       - name: Use mold-linker
         if: ${{ matrix.os == 'ubuntu-latest' }}
         uses: rui314/setup-mold@v1
@@ -86,12 +74,28 @@ jobs:
       - name: Override rust-toolchain.toml
         run: rustup override set ${{steps.toolchain.outputs.name}}
 
+      - name: Cache Project
+        uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+          shared-key: check-${{ matrix.rust-toolchain }}-${{ matrix.os }}
+          save-if: ${{ github.event_name == 'push' }}
+
+      - name: Sccache
+        uses: mozilla-actions/[email protected]
+
       - name: Check Format
         run: cargo fmt --all -- --check
 
       - name: Run Linter
         run: cargo clippy --all -- -D warnings
 
+      - name: Verify Publishing of crates
+        uses: katyo/publish-crates@v2
+        if: ${{ matrix.rust-toolchain == 'stable' && github.event_name == 'push' }}
+        with:
+          dry-run: true
+
       # Only "test" release build on push event.
       - name: Test Release
         if: ${{ matrix.rust-toolchain == 'stable' && github.event_name == 'push' }}
@@ -105,19 +109,19 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
+      - name: Use mold-linker
+        uses: rui314/setup-mold@v1
+
+      - name: Install Rust Toolchain
+        uses: dtolnay/rust-toolchain@stable
+
       - name: Cache Project
         uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
           shared-key: deny-stable-ubuntu-latest
           save-if: ${{ github.event_name == 'push' }}
 
-      - name: Use mold-linker
-        uses: rui314/setup-mold@v1
-
-      - name: Install Rust Toolchain
-        uses: dtolnay/rust-toolchain@stable
-
       # Check for security advisories
       - name: Check Advisories
         uses: EmbarkStudios/cargo-deny-action@v1
@@ -153,16 +157,6 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Cache Project
-        uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-          shared-key: test-all-${{ matrix.rust-toolchain }}-${{ matrix.os }}
-          save-if: ${{ github.event_name == 'push' }}
-
-      - name: Sccache
-        uses: mozilla-actions/[email protected]
-
       - name: Use mold-linker
         if: ${{ matrix.os == 'ubuntu-latest' }}
         uses: rui314/setup-mold@v1
@@ -176,6 +170,16 @@ jobs:
       - name: Override rust-toolchain.toml
         run: rustup override set ${{steps.toolchain.outputs.name}}
 
+      - name: Cache Project
+        uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+          shared-key: test-all-${{ matrix.rust-toolchain }}-${{ matrix.os }}
+          save-if: ${{ github.event_name == 'push' }}
+
+      - name: Sccache
+        uses: mozilla-actions/[email protected]
+
       - name: Install nextest
         uses: taiki-e/install-action@nextest
 
@@ -211,13 +215,6 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Cache Project
-        uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-          shared-key: test-all-${{ matrix.rust-toolchain }}-windows-latest
-          save-if: ${{ github.event_name == 'push' }}
-
       - name: Install Rust Toolchain
         id: toolchain
         uses: dtolnay/rust-toolchain@master
@@ -227,6 +224,13 @@ jobs:
       - name: Override rust-toolchain.toml
         run: rustup override set ${{steps.toolchain.outputs.name}}
 
+      - name: Cache Project
+        uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+          shared-key: test-all-${{ matrix.rust-toolchain }}-windows-latest
+          save-if: ${{ github.event_name == 'push' }}
+
       - name: Install nextest
         uses: taiki-e/install-action@nextest
 
@@ -255,6 +259,12 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
+      - name: Use mold-linker
+        uses: rui314/setup-mold@v1
+
+      - name: Install Rust Toolchain
+        uses: dtolnay/rust-toolchain@stable
+
       - name: Cache Project
         uses: Swatinem/rust-cache@v2
         with:
@@ -264,12 +274,6 @@ jobs:
       - name: Sccache
         uses: mozilla-actions/[email protected]
 
-      - name: Use mold-linker
-        uses: rui314/setup-mold@v1
-
-      - name: Install Rust Toolchain
-        uses: dtolnay/rust-toolchain@stable
-
       - name: Run Doc(s) compilation
         env:
           RUSTDOCFLAGS: -Dwarnings

diff --git a/release-plz.toml b/release-plz.toml
@@ -1,34 +1,34 @@
 [workspace]
-publish = false
 changelog_update = false
+publish = false
 pr_labels = ["release"]
 
 [[package]]
 name = "homestar-core"
 publish = true
 changelog_update = true
-git_release_enable = true
 
 [[package]]
 name = "homestar-runtime"
 publish = true
 changelog_update = true
-git_release_enable = true
 
 [[package]]
 name = "homestar-wasm"
 publish = true
 changelog_update = true
-git_release_enable = true
 
 [[package]]
 name = "homestar-functions-add"
 publish = false
+changelog_update = false
 
 [[package]]
 name = "homestar-functions-test"
 publish = false
+changelog_update = false
 
 [[package]]
 name = "example-websocket-relay"
 publish = false
+changelog_update = false