From f69ad6a96be415b06d7c42f20d4d138bd7ca866c Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Thu, 22 Feb 2024 10:08:50 +0200 Subject: [PATCH] ci: fix DCAP package install ubuntu-latest is not focal anymore and will eventually move to 24.04. Therefore, use a pinned ubuntu- runner and match the DCAP packages repository path with it. Signed-off-by: Mikko Ylinen --- .github/workflows/as-basic.yml | 4 ++-- .github/workflows/kbs-rust.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/as-basic.yml b/.github/workflows/as-basic.yml index 3df798574..cca0fe330 100644 --- a/.github/workflows/as-basic.yml +++ b/.github/workflows/as-basic.yml @@ -18,7 +18,7 @@ jobs: basic_ci: if: github.event_name == 'pull_request' || github.event_name == 'push' name: Check - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: RUSTC_VERSION: 1.76.0 steps: @@ -49,7 +49,7 @@ jobs: - name: Install TDX build dependencies run: | sudo curl -L https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | sudo apt-key add - - sudo echo 'deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main' | sudo tee /etc/apt/sources.list.d/intel-sgx.list + sudo echo 'deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main' | sudo tee /etc/apt/sources.list.d/intel-sgx.list sudo apt-get update sudo apt-get install -y libsgx-dcap-quote-verify-dev diff --git a/.github/workflows/kbs-rust.yml b/.github/workflows/kbs-rust.yml index 7b1cd6010..7f696c1d4 100644 --- a/.github/workflows/kbs-rust.yml +++ b/.github/workflows/kbs-rust.yml @@ -23,7 +23,7 @@ jobs: fail-fast: false env: RUSTC_VERSION: 1.76.0 - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Code checkout @@ -50,7 +50,7 @@ jobs: - name: Install TDX dependencies run: | sudo curl -L https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | sudo apt-key add - - sudo echo 'deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main' | sudo tee /etc/apt/sources.list.d/intel-sgx.list + sudo echo 'deb [arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main' | sudo tee /etc/apt/sources.list.d/intel-sgx.list sudo apt-get update sudo apt-get install -y libtdx-attest-dev libsgx-dcap-quote-verify-dev