Skip to content

ci: cache key hygiene improvements + cache clippy & msrv #2833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abnobdoss wants to merge 1 commit into
base: main
Choose a base branch
from
+66 −2
Open

ci: cache key hygiene improvements + cache clippy & msrv #2833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/bindings_python_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,18 @@ jobs:
- name: Setup Rust toolchain
if: runner.os != 'Linux'
uses: ./.github/actions/setup-builder
- name: Get runner image id
if: runner.os != 'Linux'
id: image
shell: bash
run: echo "id=${ImageOS:?}" >> "$GITHUB_OUTPUT"
- name: Cache Rust artifacts
if: runner.os != 'Linux'
uses: swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
with:
key: bindings-python
key: bindings-python-${{ steps.image.outputs.id }}-${{ hashFiles('.github/workflows/bindings_python_ci.yml', 'bindings/python/pyproject.toml', 'Cargo.toml') }}
save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
add-rust-environment-hash-key: 'false'
- uses: PyO3/maturin-action@e83996d129638aa358a18fbd1dfb82f0b0fb5d3b # v1.51.0
with:
working-directory: "bindings/python"
Expand Down
53 changes: 52 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,18 @@ jobs:
- name: Setup Rust toolchain
uses: ./.github/actions/setup-builder

- name: Get runner image id
id: image
shell: bash
run: echo "id=${ImageOS:?}" >> "$GITHUB_OUTPUT"

- name: Cache Rust artifacts
uses: swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
with:
key: ${{ steps.image.outputs.id }}-${{ hashFiles('.github/workflows/ci.yml', 'Makefile', 'Cargo.toml') }}
save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
add-rust-environment-hash-key: 'false'

- name: Cargo clippy
run: make check-clippy

Expand All @@ -116,10 +128,19 @@ jobs:
- name: Setup Rust toolchain
uses: ./.github/actions/setup-builder

# The built-in environment hash includes the preinstalled stable
# toolchain, which varies across concurrent image builds.
- name: Get runner image id
id: image
shell: bash
run: echo "id=${ImageOS:?}" >> "$GITHUB_OUTPUT"

- name: Cache Rust artifacts
uses: swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
with:
key: ${{ steps.image.outputs.id }}-${{ hashFiles('.github/workflows/ci.yml', 'Makefile', 'Cargo.toml') }}
save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
add-rust-environment-hash-key: 'false'

- name: Build
run: make build
Expand All @@ -137,10 +158,17 @@ jobs:
- name: Setup Rust toolchain
uses: ./.github/actions/setup-builder

- name: Get runner image id
id: image
shell: bash
run: echo "id=${ImageOS:?}" >> "$GITHUB_OUTPUT"

- name: Cache Rust artifacts
uses: swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
with:
key: ${{ steps.image.outputs.id }}-${{ hashFiles('.github/workflows/ci.yml', 'Makefile', 'Cargo.toml') }}
save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
add-rust-environment-hash-key: 'false'

- name: Check each crate standalone
run: |
Expand Down Expand Up @@ -172,10 +200,17 @@ jobs:
- name: Setup Rust toolchain
uses: ./.github/actions/setup-builder

- name: Get runner image id
id: image
shell: bash
run: echo "id=${ImageOS:?}" >> "$GITHUB_OUTPUT"

- name: Cache Rust artifacts
uses: swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
with:
key: ${{ steps.image.outputs.id }}-${{ hashFiles('.github/workflows/ci.yml', 'Makefile', 'Cargo.toml') }}
save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
add-rust-environment-hash-key: 'false'

- name: Build
run: cargo build -p iceberg --no-default-features
Expand All @@ -201,11 +236,17 @@ jobs:
- name: Setup Rust toolchain
uses: ./.github/actions/setup-builder

- name: Get runner image id
id: image
shell: bash
run: echo "id=${ImageOS:?}" >> "$GITHUB_OUTPUT"

- name: Cache Rust artifacts
uses: swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
with:
key: ${{ matrix.test-suite.name }}
key: ${{ matrix.test-suite.name }}-${{ steps.image.outputs.id }}-${{ hashFiles('.github/workflows/ci.yml', 'Makefile', 'Cargo.toml') }}
save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
add-rust-environment-hash-key: 'false'

- name: Install cargo-nextest
if: matrix.test-suite.name == 'default'
Expand Down Expand Up @@ -253,5 +294,15 @@ jobs:
rust-version: ${{ steps.get-msrv.outputs.msrv }}
- name: Setup Nightly Rust toolchain
uses: ./.github/actions/setup-builder
- name: Get runner image id
id: image
shell: bash
run: echo "id=${ImageOS:?}" >> "$GITHUB_OUTPUT"
- name: Cache Rust artifacts
uses: swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
with:
key: msrv-${{ steps.get-msrv.outputs.msrv }}-${{ steps.image.outputs.id }}-${{ hashFiles('.github/workflows/ci.yml', 'Makefile', 'Cargo.toml') }}
save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
add-rust-environment-hash-key: 'false'
- name: Check MSRV
run: make check-msrv
7 changes: 7 additions & 0 deletions .github/workflows/public-api.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,17 @@ jobs:
- name: Setup Rust toolchain
uses: ./.github/actions/setup-builder

- name: Get runner image id
id: image
shell: bash
run: echo "id=${ImageOS:?}" >> "$GITHUB_OUTPUT"

- name: Cache Rust artifacts
uses: swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
with:
key: ${{ steps.image.outputs.id }}-${{ hashFiles('.github/workflows/public-api.yml', 'Makefile', 'Cargo.toml') }}
save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
add-rust-environment-hash-key: 'false'

- name: Check public API
run: make check-public-api
Loading