From f364e267318980a1ee47a44e815cea1a765dad79 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Mon, 3 Feb 2025 09:48:50 +0200 Subject: [PATCH] ci: drop deprecated apt-key for DCAP libs install Signed-off-by: Mikko Ylinen --- .github/workflows/as-rust.yml | 4 ++-- .github/workflows/kbs-rust.yml | 4 ++-- kbs/test/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/as-rust.yml b/.github/workflows/as-rust.yml index aa912ba61..bf9554454 100644 --- a/.github/workflows/as-rust.yml +++ b/.github/workflows/as-rust.yml @@ -54,8 +54,8 @@ 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 noble main' | sudo tee /etc/apt/sources.list.d/intel-sgx.list + curl -L https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | sudo gpg --dearmor --output /usr/share/keyrings/intel-sgx.gpg + echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu noble 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 libsgx-dcap-default-qpl diff --git a/.github/workflows/kbs-rust.yml b/.github/workflows/kbs-rust.yml index 5f4b3c415..03fefda79 100644 --- a/.github/workflows/kbs-rust.yml +++ b/.github/workflows/kbs-rust.yml @@ -47,8 +47,8 @@ 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 noble main' | sudo tee /etc/apt/sources.list.d/intel-sgx.list + curl -L https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | sudo gpg --dearmor --output /usr/share/keyrings/intel-sgx.gpg + echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu noble 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 diff --git a/kbs/test/Makefile b/kbs/test/Makefile index 6964a4593..444dee48c 100644 --- a/kbs/test/Makefile +++ b/kbs/test/Makefile @@ -63,8 +63,8 @@ install-dev-dependencies: install-dependencies .PHONY: install-dependencies install-dependencies: - curl -L "$(SGX_REPO_URL)/intel-sgx-deb.key" | sudo apt-key add - && \ - echo "deb [arch=amd64] $(SGX_REPO_URL) $(CODENAME) main" \ + curl -L "$(SGX_REPO_URL)/intel-sgx-deb.key" | sudo gpg --dearmor --output /usr/share/keyrings/intel-sgx.gpg && \ + echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] $(SGX_REPO_URL) $(CODENAME) main" \ | sudo tee /etc/apt/sources.list.d/intel-sgx.list && \ sudo apt-get update && \ sudo apt-get install -y \