From 76b9011c9ecb8c0c713a58d034f281ba70d65d4e Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Thu, 24 Aug 2023 13:49:22 +0000 Subject: [PATCH] 8314656: GHA: No need for Debian ports keyring installation after JDK-8313701 Reviewed-by: fyang --- .github/workflows/build-cross-compile.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-cross-compile.yml b/.github/workflows/build-cross-compile.yml index c056d7a1d36..df84ecebb9e 100644 --- a/.github/workflows/build-cross-compile.yml +++ b/.github/workflows/build-cross-compile.yml @@ -111,8 +111,7 @@ jobs: g++-${{ inputs.gcc-major-version }} \ gcc-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}} \ g++-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}} \ - libxrandr-dev libxtst-dev libcups2-dev libasound2-dev \ - debian-ports-archive-keyring + libxrandr-dev libxtst-dev libcups2-dev libasound2-dev sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }} - name: 'Check cache for sysroot' @@ -134,7 +133,6 @@ jobs: --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype-dev,libpng-dev --resolve-deps --variant=minbase - $(test -n "${{ matrix.debian-keyring }}" && echo "--keyring=${{ matrix.debian-keyring }}") ${{ matrix.debian-version }} sysroot ${{ matrix.debian-repository }}