From: Sam James <sam@gentoo.org>
Date: Wed, 26 Apr 2023 00:04:09 +0000 (+0100)
Subject: CI: add GCC 13
X-Git-Tag: openssl-3.2.0-alpha1~568
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d16169964b66ddedd078ce0bc959bdb92a62827;p=thirdparty%2Fopenssl.git

CI: add GCC 13

Signed-off-by: Sam James <sam@gentoo.org>

Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20961)
---

diff --git a/.github/workflows/compiler-zoo.yml b/.github/workflows/compiler-zoo.yml
index b1d3bd920c5..f055cf04e45 100644
--- a/.github/workflows/compiler-zoo.yml
+++ b/.github/workflows/compiler-zoo.yml
@@ -36,6 +36,10 @@ jobs:
           }, {
             cc: gcc-12,
             distro: ubuntu-22.04
+          }, {
+            cc: gcc-13,
+            distro: ubuntu-22.04,
+            gcc-ppa-name: ubuntu-toolchain-r/test
           }, {
             cc: clang-6.0,
             distro: ubuntu-20.04
@@ -80,11 +84,18 @@ jobs:
     steps:
     - name: install packages
       run: |
+        gcc_ppa_name="${{ matrix.zoo.gcc-ppa-name }}"
         llvm_ppa_name="${{ matrix.zoo.llvm-ppa-name }}"
 
-        # In the Matrix above, we set llvm-ppa-name if an LLVM version isn't
-        # part of the Ubuntu version we're using. See https://apt.llvm.org/.
-        if [[ -n ${llvm_ppa_name} ]] ; then
+        # In the Matrix above:
+        # - we set gcc-ppc-name if the GCC version isn't part of the Ubuntu version we're using (see https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test).
+        # - we set llvm-ppa-name if an LLVM version isn't part of the Ubuntu version we're using (see https://apt.llvm.org/).
+        # This is especially needed because even new Ubuntu LTSes aren't available
+        # until a while after release on Github Actions.
+        if [[ -n ${gcc_ppa_name} ]] ; then
+          sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+          sudo apt-get update
+        elif [[ -n ${llvm_ppa_name} ]] ; then
             wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key |\
                 gpg --dearmor |\
                 sudo tee /usr/share/keyrings/llvm-snapshot.gpg.key > /dev/null