From cc7bc9415c3db20d7694c484127bd5326ff5f75b Mon Sep 17 00:00:00 2001 From: Marc Fehling Date: Sun, 1 Oct 2023 12:11:35 -0600 Subject: [PATCH 1/2] github-actions: update gpg keys. --- .github/workflows/linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e628fb59622..752bb928db5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -39,8 +39,8 @@ jobs: # oneapi-ci/scripts/install_linux_apt.sh - name: setup apt repository run: | - wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB - sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB + wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB + sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list sudo apt-get update -o Dir::Etc::sourcelist="sources.list.d/oneAPI.list" -o APT::Get::List-Cleanup="0" - name: collect versioned dependencies of apt packages From b7e71277413ac233a718218bebb5fe8bfaaf574b Mon Sep 17 00:00:00 2001 From: Marc Fehling Date: Sun, 1 Oct 2023 12:36:58 -0600 Subject: [PATCH 2/2] github-actions: apt-key is deprecated. --- .github/workflows/linux.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 752bb928db5..3fa845baf00 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -34,15 +34,15 @@ jobs: - uses: actions/checkout@v4 # install oneapi components from apt repository based on + # https://www.intel.com/content/www/us/en/docs/oneapi/installation-guide-linux/2023-2/apt.html # oneapi-ci/scripts/setup_apt_repo_linux.sh # oneapi-ci/scripts/apt_depends.sh # oneapi-ci/scripts/install_linux_apt.sh - name: setup apt repository run: | - wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB - sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB - echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list - sudo apt-get update -o Dir::Etc::sourcelist="sources.list.d/oneAPI.list" -o APT::Get::List-Cleanup="0" + wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null + echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list + sudo apt-get update - name: collect versioned dependencies of apt packages run : | apt-cache depends intel-oneapi-compiler-fortran \