Skip to content
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.

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

drop deprecated eaa_kbc + move gh actions to Ubuntu 24.04 #734

Merged
merged 3 commits into from
Oct 14, 2024
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
12 changes: 6 additions & 6 deletions .github/workflows/aa_basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ jobs:
rust:
- stable
instance:
- ubuntu-22.04
- ubuntu-24.04
- s390x
include:
- instance: ubuntu-22.04
- instance: ubuntu-24.04
make_args: ""
cargo_test_opts: "--features openssl,rust-crypto,all-attesters,kbs,coco_as"
cargo_lint_opts: "--workspace"
Expand Down Expand Up @@ -67,14 +67,14 @@ jobs:

- uses: ./.github/actions/install-intel-dcap
with:
ubuntu-version: jammy
if: matrix.instance == 'ubuntu-22.04'
ubuntu-version: noble
if: matrix.instance == 'ubuntu-24.04'

- name: Install TPM dependencies
run: |
sudo apt-get update
sudo apt-get install -y libtss2-dev
if: matrix.instance == 'ubuntu-22.04'
if: matrix.instance == 'ubuntu-24.04'

- name: Install dm-verity dependencies
run: |
Expand All @@ -91,7 +91,7 @@ jobs:
- name: Musl build with all platform
run: |
make LIBC=musl ttrpc=true ATTESTER=none
if: matrix.instance == 'ubuntu-22.04'
if: matrix.instance == 'ubuntu-24.04'

- name: Run cargo test
uses: actions-rs/cargo@v1
Expand Down
24 changes: 11 additions & 13 deletions .github/workflows/aa_cc_kbc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,17 @@ jobs:
defaults:
run:
working-directory: ./attestation-agent
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
rust:
- stable
kbc:
- cc_kbc
- cc_kbc_tdx
- cc_kbc_sgx
- cc_kbc_az_snp_vtpm
- cc_kbc_snp
attester:
- snp-attester
- tdx-attester
- az-snp-vtpm-attester
- az-tdx-vtpm-attester
steps:
- name: Code checkout
uses: actions/checkout@v4
Expand All @@ -57,7 +56,7 @@ jobs:

- uses: ./.github/actions/install-intel-dcap
with:
ubuntu-version: jammy
ubuntu-version: noble

- name: Install TPM dependencies
run: |
Expand All @@ -68,19 +67,18 @@ jobs:
run: |
sudo apt-get update && sudo apt-get install -y protobuf-compiler

- name: Build and install with ${{ matrix.kbc }} feature
- name: Build and install with ${{ matrix.attester }} feature
run: |
make KBC=${{ matrix.kbc }} && make install
make ATTESTER=${{ matrix.attester }} && make install

- name: Run rust lint check
uses: actions-rs/cargo@v1
with:
command: clippy
# We are getting error in generated code due to derive_partial_eq_without_eq check, so ignore it for now
args: -p kbc --all-targets --features cc_kbc,all-attesters,rust-crypto -- -D warnings -A clippy::derive_partial_eq_without_eq
args: -p kbc --all-targets --features cc_kbc,${{ matrix.attester }},rust-crypto -- -D warnings

- name: Run cargo test
uses: actions-rs/cargo@v1
with:
command: test
args: --features cc_kbc,all-attesters,rust-crypto -p kbc
args: --features cc_kbc,${{ matrix.attester }},rust-crypto -p kbc
2 changes: 1 addition & 1 deletion .github/workflows/aa_crypto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
defaults:
run:
working-directory: ./attestation-agent
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand Down
65 changes: 0 additions & 65 deletions .github/workflows/aa_eaa_kbc.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/aa_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
build-and-push-images:
permissions:
packages: write
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aa_sample_keyprovider.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
coco_keyprovider_ci:
if: github.event_name != 'push'
name: Check
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aa_sev_kbc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
defaults:
run:
working-directory: ./attestation-agent
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/api-server-rest-basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fail-fast: false
matrix:
instance:
- ubuntu-latest
- ubuntu-24.04
- s390x
rust:
- stable
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
- name: Musl build with default features
run: |
make LIBC=musl
if: matrix.instance == 'ubuntu-latest'
if: matrix.instance == 'ubuntu-24.04'

- name: Run cargo test
uses: actions-rs/cargo@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cdh_basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fail-fast: false
matrix:
instance:
- ubuntu-latest
- ubuntu-24.04
- s390x
rust:
- stable
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Musl build
run: |
make LIBC=musl
if: matrix.instance == 'ubuntu-latest'
if: matrix.instance == 'ubuntu-24.04'

- name: Run cargo test
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dco.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: [pull_request]

jobs:
commits_check_job:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
name: Commits Check
steps:
- name: Get PR Commits
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/image_rs_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- 1.76.0
- stable
instance:
- ubuntu-latest
- ubuntu-24.04
- s390x
runs-on: ${{ matrix.instance }}
steps:
Expand All @@ -58,26 +58,26 @@ jobs:

- uses: ./.github/actions/install-intel-dcap
with:
ubuntu-version: jammy
if: matrix.instance == 'ubuntu-latest'
ubuntu-version: noble
if: matrix.instance == 'ubuntu-24.04'

- name: Install TPM dependencies
run: |
sudo apt-get update
sudo apt-get install -y libtss2-dev
if: matrix.instance == 'ubuntu-latest'
if: matrix.instance == 'ubuntu-24.04'

- name: Install dm-verity dependencies
run: |
sudo apt-get update
sudo apt-get install -y libdevmapper-dev
if: matrix.instance == 'ubuntu-latest'
if: matrix.instance == 'ubuntu-24.04'

- name: Install cross-compliation support dependencies
run: |
sudo apt install -y gcc-powerpc64le-linux-gnu
rustup target add powerpc64le-unknown-linux-gnu
if: matrix.instance == 'ubuntu-latest'
if: matrix.instance == 'ubuntu-24.04'

- name: Run cargo fmt check
uses: actions-rs/cargo@v1
Expand All @@ -96,7 +96,7 @@ jobs:
run: |
cargo clippy -p image-rs --all-targets --features=enclave-cc-cckbc-native-tls --no-default-features -- -D warnings
cargo clippy -p image-rs --all-targets --features=kata-cc-native-tls,nydus --no-default-features -- -D warnings
if: matrix.instance == 'ubuntu-latest'
if: matrix.instance == 'ubuntu-24.04'

- name: Run cargo build
uses: actions-rs/cargo@v1
Expand All @@ -107,7 +107,7 @@ jobs:
- name: Run cargo build, cross-compiling for powerpc64le
run: |
sudo -E PATH=$PATH -s RUSTFLAGS=" -C linker=powerpc64le-linux-gnu-gcc" cargo build --target powerpc64le-unknown-linux-gnu -p image-rs --features default
if: matrix.instance == 'ubuntu-latest'
if: matrix.instance == 'ubuntu-24.04'

- name: Run cargo test - default
run: |
Expand Down Expand Up @@ -142,4 +142,4 @@ jobs:
- name: Run cargo test - kata-cc (native-tls version) with keywrap-ttrpc (default) + keywrap-jwe + nydus
run: |
sudo -E PATH=$PATH -s cargo test -p image-rs --no-default-features --features=kata-cc-native-tls,keywrap-jwe,nydus
if: matrix.instance == 'ubuntu-latest'
if: matrix.instance == 'ubuntu-24.04'
2 changes: 1 addition & 1 deletion .github/workflows/links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
checklinks:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down
27 changes: 3 additions & 24 deletions .github/workflows/ocicrypt_rs_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,29 +25,20 @@ jobs:
ci:
if: github.event_name != 'push'
name: Check
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
rust:
- 1.76.0
- stable

# Run all steps in the compilation testing containers
container:
image: runetest/compilation-testing:ubuntu20.04
env:
LD_LIBRARY_PATH: /usr/local/lib/rats-tls

steps:
- name: Code checkout
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Update cargo home
run: |
apt-get update && apt-get install -y cargo
cp -r /root/.cargo /github/home/.cargo

- name: Install Rust toolchain (${{ matrix.rust }})
uses: actions-rs/toolchain@v1
with:
Expand All @@ -58,19 +49,7 @@ jobs:

- name: Install tonic's protoc dependencies
run: |
apt install -y protobuf-compiler libprotobuf-dev

- name: Build and install rats-tls
run: |
PWD=$(pwd)
cd /tmp
apt-get install -y libcurl4-openssl-dev
git clone https://github.com/inclavare-containers/rats-tls
cd rats-tls
git reset --hard 8fbfdb6
cmake -DBUILD_SAMPLES=on -H. -Bbuild
make -C build install
cd $PWD
sudo apt install -y protobuf-compiler libprotobuf-dev

- name: Run cargo build
uses: actions-rs/cargo@v1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
{ tee: cca, arch: x86_64, libc: musl },
{ tee: se, arch: s390x, libc: gnu },
]
runs-on: ${{ matrix.platform.arch == 's390x' && 's390x' || 'ubuntu-22.04' }}
runs-on: ${{ matrix.platform.arch == 's390x' && 's390x' || 'ubuntu-24.04' }}
env:
TEE_PLATFORM: ${{ matrix.platform.tee }}
LIBC: ${{ matrix.platform.libc }}
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:

- uses: ./.github/actions/install-intel-dcap
with:
ubuntu-version: jammy
ubuntu-version: noble
if: matrix.platform.tee == 'tdx'

- uses: actions/checkout@v4
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
libc: musl
- arch: s390x
libc: gnu
runs-on: ${{ matrix.arch == 's390x' && 's390x' || 'ubuntu-22.04' }}
runs-on: ${{ matrix.arch == 's390x' && 's390x' || 'ubuntu-24.04' }}
env:
LIBC: ${{ matrix.libc }}
REGISTRY: ghcr.io
Expand Down
Loading
Loading