Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .bootc-dev-infra-commit.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
486f80629171817efc99ded97d6902b59a2c7e26
ac9dac019eeafc3a1791bd564cbd8d1455f2a6e9
10 changes: 0 additions & 10 deletions .github/actions/bootc-ubuntu-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,6 @@ runs:
id: set_arch
shell: bash
run: echo "ARCH=$(arch)" >> $GITHUB_ENV
# We often use Rust, so set up opinionated default caching
- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
cache-all-crates: true
# Only generate caches on push to git main
save-if: ${{ github.ref == 'refs/heads/main' }}
# Suppress actually using the cache for builds running from
# git main so that we avoid incremental compilation bugs
lookup-only: ${{ github.ref == 'refs/heads/main' }}
# Install libvirt stack if requested
- name: Install libvirt and virtualization stack
if: ${{ inputs.libvirt == 'true' }}
Expand Down
20 changes: 20 additions & 0 deletions .github/actions/setup-rust/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: 'Setup Rust'
description: 'Install Rust toolchain with caching and nextest'
runs:
using: 'composite'
steps:
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
- name: Install nextest
uses: taiki-e/install-action@v2
with:
tool: nextest
- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
cache-all-crates: true
# Only generate caches on push to git main
save-if: ${{ github.ref == 'refs/heads/main' }}
# Suppress actually using the cache for builds running from
# git main so that we avoid incremental compilation bugs
lookup-only: ${{ github.ref == 'refs/heads/main' }}
11 changes: 4 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: ./.github/actions/bootc-ubuntu-setup
- name: Setup bootc Ubuntu environment
uses: ./.github/actions/bootc-ubuntu-setup
with:
libvirt: 'true'

Expand All @@ -33,9 +34,7 @@ jobs:
echo "ALL_BASE_IMAGES=$(just --evaluate ALL_BASE_IMAGES)" >> $GITHUB_ENV

- name: Setup Rust
uses: dtolnay/rust-toolchain@stable

- uses: taiki-e/install-action@nextest
uses: ./.github/actions/setup-rust

- name: Build
run: just validate && just build
Expand Down Expand Up @@ -102,9 +101,7 @@ jobs:
echo "ALL_BASE_IMAGES=$(just --evaluate ALL_BASE_IMAGES)" >> $GITHUB_ENV

- name: Setup Rust
uses: dtolnay/rust-toolchain@stable

- uses: taiki-e/install-action@nextest
uses: ./.github/actions/setup-rust

- name: Pull test images
run: just pull-test-images
Expand Down
Loading