Update test configs

morzhovets · Jan 14, 2024 · 42f97c8 · 42f97c8
1 parent 210dafa
commit 42f97c8
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 38 deletions.
diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
@@ -113,13 +113,7 @@ jobs:
     - name: Install Ninja
       run: sudo apt-get install ninja-build
     - name: Install Clang
-      if: matrix.ubuntu_ver == '20.04'
       run: sudo apt install clang-${{ matrix.clang_ver }}
-    - name: Setup Clang
-      if: matrix.ubuntu_ver == '22.04'
-      uses: egor-tensin/setup-clang@v1
-      with:
-        version: ${{ matrix.clang_ver }}
     - name: Build
       env:
         CXX: clang++-${{ matrix.clang_ver }}

diff --git a/.github/workflows/macos_clang.yml b/.github/workflows/macos_clang.yml
@@ -8,34 +8,34 @@ jobs:
       matrix:
         include:
 
-#        - clang_ver: '11'
+#        - clang_ver: '12'
 #          build_type: 'Release'
 #          flags: '-std=c++20 -Werror -msse2 -DLIBCPP_TEST_DEDUCTION_GUIDES'
 #          macos_ver: '12'
 #
-#        - clang_ver: '12'
+#        - clang_ver: '13'
 #          build_type: 'Release'
 #          flags: '-std=c++20 -Werror -msse2 -DLIBCPP_TEST_DEDUCTION_GUIDES'
 #          macos_ver: '12'
 #
-#        - clang_ver: '13'
+#        - clang_ver: '14'
 #          build_type: 'Release'
 #          flags: '-std=c++20 -Werror -msse2 -DLIBCPP_TEST_DEDUCTION_GUIDES'
 #          macos_ver: '12'
 
-        - clang_ver: '14'
+        - clang_ver: '15'
           build_type: 'Release'
           flags: '-std=c++20 -Werror -msse2 -DLIBCPP_TEST_DEDUCTION_GUIDES'
           macos_ver: '12'
 
-        - clang_ver: '15'
+        - clang_ver: '16'
           build_type: 'Release'
           flags: '-std=c++20 -Werror -msse2 -DLIBCPP_TEST_DEDUCTION_GUIDES'
           macos_ver: '12'
 
-        - clang_ver: '16'
+        - clang_ver: '17'
           build_type: 'Release'
-          flags: '-std=c++20 -Werror -msse2 -DLIBCPP_TEST_DEDUCTION_GUIDES'
+          flags: '-std=c++23 -Werror -msse2 -DLIBCPP_TEST_DEDUCTION_GUIDES'
           macos_ver: '12'
 
         # -DTEST_LIBCXX_NEW

diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
@@ -4,7 +4,6 @@ on: [push, pull_request]
 
 jobs:
   build-and-test:
-    if: ${{ false }}
     strategy:
       matrix:
         include:
@@ -21,29 +20,29 @@ jobs:
           build_type: 'Release'
           flags: '-std=c++23 -Wa,-mbig-obj -msse2 -DTEST_LIBCXX_NEW'
 
-        - arch: 'x86'
-          build_type: 'Release'
-          flags: '-std=c++11 -Wa,-mbig-obj -msse2'
-
-        - arch: 'x86'
-          build_type: 'Release'
-          flags: '-std=c++11 -Wa,-mbig-obj -fno-rtti -DMOMO_USE_SAFE_MAP_BRACKETS -DMOMO_USE_UNORDERED_HINT_ITERATORS -DMOMO_DISABLE_TYPE_INFO'
-
-        - arch: 'x86'
-          build_type: 'Release'
-          flags: '-std=c++23 -Wa,-mbig-obj -msse2 -DLIBCPP_TEST_DEDUCTION_GUIDES'
-
-        - arch: 'x86'
-          build_type: 'Release'
-          flags: '-std=c++23 -Wa,-mbig-obj -DLIBCPP_TEST_DEDUCTION_GUIDES -fno-rtti -DMOMO_USE_SAFE_MAP_BRACKETS -DMOMO_USE_UNORDERED_HINT_ITERATORS -DMOMO_DISABLE_TYPE_INFO'
-
-        - arch: 'x86'
-          build_type: 'Release'
-          flags: '-std=c++23 -Wa,-mbig-obj -msse2 -DTEST_LIBCXX_NEW'
-
-        - arch: 'x86'
-          build_type: 'Release'
-          flags: '-std=c++23 -Wa,-mbig-obj -DTEST_LIBCXX_NEW -fno-rtti -DMOMO_USE_SAFE_MAP_BRACKETS -DMOMO_USE_UNORDERED_HINT_ITERATORS -DMOMO_DISABLE_TYPE_INFO'
+#        - arch: 'x86'
+#          build_type: 'Release'
+#          flags: '-std=c++11 -Wa,-mbig-obj -msse2'
+#
+#        - arch: 'x86'
+#          build_type: 'Release'
+#          flags: '-std=c++11 -Wa,-mbig-obj -fno-rtti -DMOMO_USE_SAFE_MAP_BRACKETS -DMOMO_USE_UNORDERED_HINT_ITERATORS -DMOMO_DISABLE_TYPE_INFO'
+#
+#        - arch: 'x86'
+#          build_type: 'Release'
+#          flags: '-std=c++23 -Wa,-mbig-obj -msse2 -DLIBCPP_TEST_DEDUCTION_GUIDES'
+#
+#        - arch: 'x86'
+#          build_type: 'Release'
+#          flags: '-std=c++23 -Wa,-mbig-obj -DLIBCPP_TEST_DEDUCTION_GUIDES -fno-rtti -DMOMO_USE_SAFE_MAP_BRACKETS -DMOMO_USE_UNORDERED_HINT_ITERATORS -DMOMO_DISABLE_TYPE_INFO'
+#
+#        - arch: 'x86'
+#          build_type: 'Release'
+#          flags: '-std=c++23 -Wa,-mbig-obj -msse2 -DTEST_LIBCXX_NEW'
+#
+#        - arch: 'x86'
+#          build_type: 'Release'
+#          flags: '-std=c++23 -Wa,-mbig-obj -DTEST_LIBCXX_NEW -fno-rtti -DMOMO_USE_SAFE_MAP_BRACKETS -DMOMO_USE_UNORDERED_HINT_ITERATORS -DMOMO_DISABLE_TYPE_INFO'
 
     runs-on: windows-2022
 
@@ -53,7 +52,8 @@ jobs:
     - name: Setup Ninja
       uses: seanmiddleditch/gha-setup-ninja@v3
     - name: Setup MinGW
-      uses: egor-tensin/setup-mingw@v2
+      uses: e-t-l/setup-mingw@patch-1
+#      uses: egor-tensin/setup-mingw@v2
       with:
         platform: ${{ matrix.arch }}
     - name: Build