From db057d7d964dda1c3dbc78dba4199999d292af58 Mon Sep 17 00:00:00 2001
From: Glyn Matthews <glyn.matthews@gmail.com>
Date: Sat, 8 May 2021 12:16:12 +0200
Subject: [PATCH 1/2] Added support for clang 12 compiler

---
 .github/workflows/skyr-url-ci.yml | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/skyr-url-ci.yml b/.github/workflows/skyr-url-ci.yml
index 9c4bd8fc..e1481429 100644
--- a/.github/workflows/skyr-url-ci.yml
+++ b/.github/workflows/skyr-url-ci.yml
@@ -200,6 +200,22 @@ jobs:
             cxx_standard: 20,
           }
 
+          # Clang-12
+          - {
+            name: "Linux Clang 12 Debug (C++20)", artifact: "Linux.tar.xz",
+            os: ubuntu-latest,
+            build_type: Debug,
+            cc: "clang-12", cxx: "clang++-12",
+            cxx_standard: 20,
+          }
+          - {
+            name: "Linux Clang 12 Release (C++20)", artifact: "Linux.tar.xz",
+            os: ubuntu-latest,
+            build_type: RelWithDebInfo,
+            cc: "clang-12", cxx: "clang++-12",
+            cxx_standard: 20,
+          }
+
           # AppleClang
           - {
             name: "macOS Clang Debug (C++17)", artifact: "macOS.tar.xz",
@@ -354,6 +370,16 @@ jobs:
           chmod +x llvm.sh
           sudo ./llvm.sh 11
 
+      - name: Install Clang 12
+        id: install_clang_12
+        if: startsWith(matrix.config.os, 'ubuntu') && ( matrix.config.cxx == 'clang++-12' )
+        shell: bash
+        working-directory: ${{ env.HOME }}
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 12
+
       - name: Install vcpkg (Linux)
         id: vcpkg_linux
         if: startsWith(matrix.config.os, 'ubuntu')
@@ -429,7 +455,9 @@ jobs:
               "${{ matrix.config.name }}" STREQUAL "Linux GCC 10 Debug (C++20)" OR
               "${{ matrix.config.name }}" STREQUAL "Linux GCC 10 Release (C++20)" OR
               "${{ matrix.config.name }}" STREQUAL "Linux Clang 11 Debug (C++20)" OR
-              "${{ matrix.config.name }}" STREQUAL "Linux Clang 11 Release (C++20)"
+              "${{ matrix.config.name }}" STREQUAL "Linux Clang 11 Release (C++20)" OR
+              "${{ matrix.config.name }}" STREQUAL "Linux Clang 12 Debug (C++20)" OR
+              "${{ matrix.config.name }}" STREQUAL "Linux Clang 12 Release (C++20)"
           )
             set(BUILD_V2 ON)
           endif()

From a0009bdba60bfc2a7843f2194cdc0c41334dfeeb Mon Sep 17 00:00:00 2001
From: Glyn Matthews <glyn.matthews@gmail.com>
Date: Sat, 8 May 2021 15:04:32 +0200
Subject: [PATCH 2/2] Added support for g++ 11 compiler

---
 .github/workflows/skyr-url-ci.yml | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/skyr-url-ci.yml b/.github/workflows/skyr-url-ci.yml
index e1481429..a5cd7813 100644
--- a/.github/workflows/skyr-url-ci.yml
+++ b/.github/workflows/skyr-url-ci.yml
@@ -77,7 +77,6 @@ jobs:
             cxx_standard: 20
           }
 
-
           # GCC-10
           - {
             name: "Linux GCC 10 Debug (C++17)", artifact: "Linux.tar.xz",
@@ -108,6 +107,22 @@ jobs:
             cxx_standard: 20,
           }
 
+          # GCC-11
+          - {
+            name: "Linux GCC 11 Debug (C++20)", artifact: "Linux.tar.xz",
+            os: ubuntu-latest,
+            build_type: Debug,
+            cc: "gcc-11", cxx: "g++-11",
+            cxx_standard: 20,
+          }
+          - {
+            name: "Linux GCC 11 Release (C++20)", artifact: "Linux.tar.xz",
+            os: ubuntu-latest,
+            build_type: RelWithDebInfo,
+            cc: "gcc-11", cxx: "g++-11",
+            cxx_standard: 20,
+          }
+
           # Clang-8
           - {
             name: "Linux Clang 8 Debug (C++17)", artifact: "Linux.tar.xz",
@@ -341,6 +356,15 @@ jobs:
           sudo apt-get update
           sudo apt-get -y install g++-8
 
+      - name: Install GCC 11
+        id: install_gcc_11
+        if: startsWith(matrix.config.os, 'ubuntu') && ( matrix.config.cxx == 'g++-11' )
+        shell: bash
+        working-directory: ${{ env.HOME }}
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install g++-11
+
       - name: Install Clang 8
         id: install_clang_8
         if: startsWith(matrix.config.os, 'ubuntu') && ( matrix.config.cxx == 'clang++-8' )
@@ -454,6 +478,8 @@ jobs:
               "${{ matrix.config.name }}" STREQUAL "Windows MSVC 2019 Release (C++20)" OR
               "${{ matrix.config.name }}" STREQUAL "Linux GCC 10 Debug (C++20)" OR
               "${{ matrix.config.name }}" STREQUAL "Linux GCC 10 Release (C++20)" OR
+              "${{ matrix.config.name }}" STREQUAL "Linux GCC 11 Debug (C++20)" OR
+              "${{ matrix.config.name }}" STREQUAL "Linux GCC 11 Release (C++20)" OR
               "${{ matrix.config.name }}" STREQUAL "Linux Clang 11 Debug (C++20)" OR
               "${{ matrix.config.name }}" STREQUAL "Linux Clang 11 Release (C++20)" OR
               "${{ matrix.config.name }}" STREQUAL "Linux Clang 12 Debug (C++20)" OR
