Skip to content

Commit

Permalink
ci: github actions using the correct rust versions
Browse files Browse the repository at this point in the history
  • Loading branch information
drmorr0 committed Dec 17, 2024
1 parent 71a5eee commit aa21161
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 15 deletions.
15 changes: 15 additions & 0 deletions .github/actions/setup-builder/action.yml
Original file line number Diff line number Diff line change
@@ -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/[email protected]
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
submodules: recursive
- name: Fetch tags
run: git fetch --tags
- name: Run sccache
uses: mozilla-actions/[email protected]
- name: Setup Builder
uses: ./.github/actions/setup-builder
- name: Build
run: EXTRA_BUILD_ARTIFACTS= make build
- name: Login to Quay.io
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive
- name: Run sccache
uses: mozilla-actions/[email protected]
- name: Setup Builder
uses: ./.github/actions/setup-builder
- name: Build skctl
run: make skctl
- name: Check version
Expand All @@ -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/[email protected]
- name: Setup Builder
uses: ./.github/actions/setup-builder
- name: Build
run: make build
- name: Regenerate CRDs
Expand All @@ -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/[email protected]
- name: Setup Builder
uses: ./.github/actions/setup-builder
- name: rustfmt nightly
run: |
rustup toolchain install nightly-x86_64-unknown-linux-gnu
Expand All @@ -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/[email protected]
- 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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sk-store/src/store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit aa21161

Please sign in to comment.