ci: fixes

* run on matrix.os * disable old clang compilers * enable more windows builds
boostorg · Nov 1, 2023 · 5844d03 · 5844d03
1 parent b14bfda
commit 5844d03
Showing 1 changed file with 38 additions and 155 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,8 +13,8 @@ on:
 
 jobs:
   runner-selection:
-    # runs-on: ubuntu-latest
-    runs-on: ${{ github.repository_owner == 'boostorg' && fromJSON('[ "self-hosted", "linux", "x64", "ubuntu-latest-aws" ]') || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
+    # runs-on: ${{ github.repository_owner == 'boostorg' && fromJSON('[ "self-hosted", "linux", "x64", "ubuntu-latest-aws" ]') || 'ubuntu-latest' }}
     outputs:
       labelmatrix: ${{ steps.aws_hosted_runners.outputs.labelmatrix }}
     steps:
@@ -72,76 +72,22 @@ jobs:
             os: ubuntu-22.04
             install: g++-11
             supported: true
-          - toolset: clang
-            compiler: clang++-3.6
-            cxxstd: "11,14"
-            os: ubuntu-22.04
-            container: ubuntu:16.04
-            install: clang-3.6
-            supported: true
-          - toolset: clang
-            compiler: clang++-3.7
-            cxxstd: "11,14"
-            os: ubuntu-22.04
-            container: ubuntu:16.04
-            install: clang-3.7
-            supported: true
-          - toolset: clang
-            compiler: clang++-3.8
-            cxxstd: "11,14"
-            os: ubuntu-22.04
-            container: ubuntu:16.04
-            install: clang-3.8
-            supported: true
-          - toolset: clang
-            compiler: clang++-3.9
-            cxxstd: "11,14"
-            os: ubuntu-22.04
-            container: ubuntu:16.04
-            install: clang-3.9
-            supported: true
-          - toolset: clang
-            compiler: clang++-4.0
-            cxxstd: "11,14"
-            os: ubuntu-22.04
-            container: ubuntu:16.04
-            install: clang-4.0
-            supported: true
-          - toolset: clang
-            compiler: clang++-5.0
-            cxxstd: "11,14"
-            os: ubuntu-22.04
-            container: ubuntu:16.04
-            install: clang-5.0
-            supported: true
-          - toolset: clang
-            install: clang-6.0
-            compiler: clang++-6.0
-            cxxstd: "11,14,17"
-            os: ubuntu-22.04
-            container: ubuntu:18.04
-            supported: true
-          - toolset: clang
-            install: clang-7
-            compiler: clang++-7
-            cxxstd: "11,14"
+          - toolset: gcc-12
+            cxxstd: "11,14,17,20"
             os: ubuntu-22.04
-            container: ubuntu:18.04
+            install: g++-12
             supported: true
-          - toolset: clang
-            install: clang-8
-            compiler: clang++-8
-            cxxstd: "11,14,17"
+          - toolset: gcc-13
+            cxxstd: "11,14,17,20"
             os: ubuntu-22.04
-            container: ubuntu:18.04
+            install: g++-13
             supported: true
           - toolset: clang
             install: clang-9
             compiler: clang++-9
-            cxxstd: "11,14,17,2a"
+            cxxstd: "11,14,17"
             os: ubuntu-22.04
             container: ubuntu:18.04
-            supported: "Causes segfault on GHA CI, not on official image"
           - toolset: clang
             install: clang-10
             compiler: clang++-10
@@ -172,30 +118,39 @@ jobs:
             cxxstd: "11,14,17,20"
             os: ubuntu-22.04
             supported: true
-            # macos
-          - description: macos-cxx11
-            toolset: clang
-            cxxstd: "11"
-            os: macos-11
+          - toolset: clang
+            install: clang-15
+            compiler: clang++-15
+            cxxstd: "11,14,17,20"
+            os: ubuntu-22.04
             supported: true
-          - description: macos-cxx14
+          # - toolset: clang
+          #   install: clang-16
+          #   compiler: clang++-16
+          #   cxxstd: "11,14,17,20"
+          #   os: ubuntu-22.04
+          #   supported: true
+
+          # macos
+          - description: macos-11
             toolset: clang
-            cxxstd: "14"
+            cxxstd: "11,14,17,2a"
             os: macos-11
             supported: true
-          - description: macos-cxx17
+          - description: macos-12
             toolset: clang
-            cxxstd: "17"
+            cxxstd: "11,14,17,20"
             os: macos-11
             supported: true
-          - description: macos-cxx2a
+          - description: macos-13
             toolset: clang
-            cxxstd: "2a"
+            cxxstd: "11,14,17,20"
             os: macos-11
             supported: true
 
     needs: [runner-selection]
-    runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)[matrix.os] }}
+    # runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)[matrix.os] }}
+    runs-on: ${{matrix.os}}
     container: ${{ matrix.container }}
     env: {B2_USE_CCACHE: 1}
 
@@ -290,100 +245,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        addrmd: [32, 64]
+        os: windows-2019
         include:
-          - description: msvc-14.2-cxx14-win32
-            toolset: msvc-14.2
-            cxxstd: "14"
-            addrmd: 32
-            os: windows-2019
-            cxxflags: ""
-            supported: true
-          - description: msvc-14.2-cxx17-win32
-            toolset: msvc-14.2
-            cxxstd: "17"
-            addrmd: 32
-            os: windows-2019
-            cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
-            supported: true
-          - description: msvc-14.2-cxx20-win32
-            toolset: msvc-14.2
-            cxxstd: "latest"
-            addrmd: 32
-            os: windows-2019
-            cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
-            supported: true
-          - description: msvc-14.2-cxx14-win64
-            toolset: msvc-14.2
-            cxxstd: "14"
-            addrmd: 64
-            os: windows-2019
-            cxxflags: ""
-            supported: true
-          - description: msvc-14.2-cxx17-win64
-            toolset: msvc-14.2
-            cxxstd: "17"
-            addrmd: 64
-            os: windows-2019
-            cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
-            supported: true
-          - description: msvc-14.2-cxx20-win64
+          - description: msvc-14.2
             toolset: msvc-14.2
-            cxxstd: "latest"
-            addrmd: 64
-            os: windows-2019
+            cxxstd: "14,17"
             cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
             supported: true
-          # - description: msvc-14.3-cxx14-win32
-          #   toolset: msvc-14.3
-          #   cxxstd: "14"
-          #   addrmd: 32
-          #   os: windows-2022
-          #   cxxflags: ""
-          #   supported: true
-          # - description: msvc-14.3-cxx17-win32
-          #   toolset: msvc-14.3
-          #   cxxstd: "17"
-          #   addrmd: 32
-          #   os: windows-2022
-          #   cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
-          #   supported: true
-          - description: msvc-14.3-cxx20-win32
+          - description: msvc-14.3
             toolset: msvc-14.3
-            cxxstd: "20"
-            addrmd: 32
-            os: windows-2022
-            cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
-            supported: true
-          # - description: msvc-14.3-cxx14-win64
-          #   toolset: msvc-14.3
-          #   cxxstd: "14"
-          #   addrmd: 64
-          #   os: windows-2022
-          #   cxxflags: ""
-          #   supported: true
-          # - description: msvc-14.3-cxx17-win64
-          #   toolset: msvc-14.3
-          #   cxxstd: "17"
-          #   addrmd: 64
-          #   os: windows-2022
-          #   cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
-          #   supported: true
-          - description: msvc-14.3-cxx20-win64
-            toolset: msvc-14.3
-            cxxstd: "20"
-            addrmd: 64
-            os: windows-2022
+            cxxstd: "14,17,20"
             cxxflags: "cxxflags=-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1"
             supported: true
           - toolset: gcc
             cxxstd: "11,14,17,2a"
             addrmd: 64
-            os: windows-2019
             cxxflags: "cxxflags=-Wa,-mbig-obj"
             supported: "Too many unknowns to get this compiler working - gcc-8.1"
 
     needs: [runner-selection]
-    runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)[matrix.os] }}
+    # runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)[matrix.os] }}
+    runs-on: ${{matrix.os}}
 
     steps:
       - uses: actions/checkout@v3