diff --git a/.github/actions/setup-builder/action.yml b/.github/actions/setup-builder/action.yml new file mode 100644 index 00000000..b7b9b2e0 --- /dev/null +++ b/.github/actions/setup-builder/action.yml @@ -0,0 +1,15 @@ +--- +name: Setup Rust Builder +runs: + using: composite + steps: + - name: Set up rust tools + uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + toolchain: 1.79.0 + components: clippy + cache-directories: | + ./.build + /tmp/cargo + - name: Run sccache + uses: mozilla-actions/sccache-action@v0.0.3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4046715d..3d763c61 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,8 +20,8 @@ jobs: submodules: recursive - name: Fetch tags run: git fetch --tags - - name: Run sccache - uses: mozilla-actions/sccache-action@v0.0.3 + - name: Setup Builder + uses: ./.github/actions/setup-builder - name: Build run: EXTRA_BUILD_ARTIFACTS= make build - name: Login to Quay.io diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index f5447d68..7e496013 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -27,8 +27,8 @@ jobs: uses: actions/checkout@v4 with: submodules: recursive - - name: Run sccache - uses: mozilla-actions/sccache-action@v0.0.3 + - name: Setup Builder + uses: ./.github/actions/setup-builder - name: Build skctl run: make skctl - name: Check version @@ -38,11 +38,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out repo and build scripts - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive - - name: Run sccache - uses: mozilla-actions/sccache-action@v0.0.3 + - name: Setup Builder + uses: ./.github/actions/setup-builder - name: Build run: make build - name: Regenerate CRDs @@ -56,11 +56,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out repo and build scripts - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive - - name: Run sccache - uses: mozilla-actions/sccache-action@v0.0.3 + - name: Setup Builder + uses: ./.github/actions/setup-builder - name: rustfmt nightly run: | rustup toolchain install nightly-x86_64-unknown-linux-gnu @@ -81,11 +81,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out repo and build scripts - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive - - name: Run sccache - uses: mozilla-actions/sccache-action@v0.0.3 + - name: Setup Builder + uses: ./.github/actions/setup-builder - name: Install grcov run: | curl -LO https://github.com/mozilla/grcov/releases/download/v0.8.18/grcov-x86_64-unknown-linux-gnu.tar.bz2 @@ -107,7 +107,7 @@ jobs: - test steps: - name: Check out repo and build scripts - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive - name: Download coverage diff --git a/sk-store/src/store.rs b/sk-store/src/store.rs index a0409883..1ccba3b8 100644 --- a/sk-store/src/store.rs +++ b/sk-store/src/store.rs @@ -302,7 +302,7 @@ impl TraceStorable for TraceStore { // of data that are unique to each pod that won't materially impact the behaviour? // This does occur for example with coredns's volume mounts. We may need to filter // more things out from this and/or allow users to specify what is filtered out. - let hash = jsonutils::hash(&serde_json::to_value(&pod.stable_spec()?)?); + let hash = jsonutils::hash(&serde_json::to_value(pod.stable_spec()?)?); self.pod_owners .store_new_pod_lifecycle(ns_name, &owner_gvk, &owner_ns_name, hash, lifecycle_data); break;