Can't use clang 13 & 14 on focal.

Try older clang on focal.
Adjust more clang and gcc versions...
2023-11-01 18:25:53 +00:00 · 2023-11-01 18:23:05 +00:00 · 2023-11-01 17:34:17 +00:00 · 2023-11-01 17:19:48 +00:00 · 2023-11-01 17:16:39 +00:00 · 2023-11-01 17:12:48 +00:00
2 changed files with 61 additions and 11 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        compiler: [ g++-11, g++-12, clang++-14 ]
+        compiler: [ g++-11, g++-12, g++-13 ]
    steps:
      - uses: actions/checkout@v3
        with:
@@ -34,7 +34,7 @@ jobs:
      - name: Add repository
        run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
      - name: Install packages
-        run: sudo apt install g++-11 g++-12 clang-14
+        run: sudo apt install g++-11 g++-12 g++-13
      - name: Checkout main boost
        run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
      - name: Update Dependencies
@@ -63,7 +63,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        compiler: [ clang++-11, clang++-12, clang++-13 ]
+        compiler: [ clang++-15 ]
    steps:
      - uses: actions/checkout@v3
        with:
@@ -78,7 +78,7 @@ jobs:
      - name: Add repository
        run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
      - name: Install packages
-        run: sudo apt install clang-11 clang-12 clang-13
+        run: sudo apt install clang-15
      - name: Checkout main boost
        run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
      - name: Update Dependencies
@@ -146,6 +146,50 @@ jobs:
      - name: Test
        run: ../../../b2 toolset=$TOOLSET cxxstd=03,11,14,17,2a
        working-directory: ../boost-root/libs/config/test
+  ubuntu-focal-clang:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [ clang++-11, clang++-12 ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: '0'
+      - uses: mstachniuk/ci-skip@v1
+        with:
+          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE]'
+          commit-filter-separator: ';'
+          fail-fast: true
+      - name: Set TOOLSET
+        run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
+      - name: Add repository
+        run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
+      - name: Install packages
+        run: sudo apt install clang-11 clang-12
+      - name: Checkout main boost
+        run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
+      - name: Update Dependencies
+        run: git submodule update --init tools/build tools/boost_install libs/headers libs/detail libs/core libs/assert libs/type_traits
+        working-directory: ../boost-root
+      - name: Copy files
+        run: cp -r $GITHUB_WORKSPACE/* libs/config
+        working-directory: ../boost-root
+      - name: Bootstrap
+        run: ./bootstrap.sh
+        working-directory: ../boost-root
+      - name: Generate headers
+        run: ./b2 headers
+        working-directory: ../boost-root
+      - name: Generate user config
+        run: 'echo "using $TOOLSET : : ${{ matrix.compiler }} ;" > ~/user-config.jam'
+        working-directory: ../boost-root
+      - name: Config info
+        run: ../../../b2 print_config_info toolset=$TOOLSET cxxstd=03,11,14,17,2a
+        working-directory: ../boost-root/libs/config/test
+      - name: Test
+        run: ../../../b2 toolset=$TOOLSET cxxstd=03,11,14,17,2a
+        working-directory: ../boost-root/libs/config/test
  macos_11:
    runs-on: macos-11
    strategy:
@@ -249,10 +293,10 @@ jobs:
        run: b2 headers
        working-directory: ../boost-root
      - name: Config info
-        run: ..\..\..\b2 print_config_info cxxstd=14,17 address-model=64 toolset=msvc-14.0
+        run: ..\..\..\b2 print_config_info cxxstd=14,latest address-model=64 toolset=msvc-14.0
        working-directory: ../boost-root/libs/config/test
      - name: Test
-        run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17 toolset=msvc-14.0
+        run: ..\..\..\b2 --hash address-model=64 cxxstd=14,latest toolset=msvc-14.0
        working-directory: ../boost-root/libs/config/test
  windows_msvc_14_2:
    runs-on: windows-2019
@@ -287,10 +331,10 @@ jobs:
        run: b2 headers
        working-directory: ../boost-root
      - name: Config info
-        run: ..\..\..\b2 print_config_info cxxstd=14,17,latest address-model=64 toolset=msvc-14.2
+        run: ..\..\..\b2 print_config_info cxxstd=14,17,20,latest address-model=64 toolset=msvc-14.2
        working-directory: ../boost-root/libs/config/test
      - name: Test
-        run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17,latest toolset=msvc-14.2
+        run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17,20,latest toolset=msvc-14.2
        working-directory: ../boost-root/libs/config/test
  windows_msvc_14_3:
    runs-on: windows-2022
@@ -325,7 +369,7 @@ jobs:
        run: b2 headers
        working-directory: ../boost-root
      - name: Config info
-        run: ..\..\..\b2 print_config_info cxxstd=14,17,latest address-model=64 toolset=msvc-14.3
+        run: ..\..\..\b2 print_config_info cxxstd=14,17,20,latest address-model=64 toolset=msvc-14.3
        working-directory: ../boost-root/libs/config/test
      - name: Test
        run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17,20,latest toolset=msvc-14.3
--- a/include/boost/config/compiler/clang_version.hpp
+++ b/include/boost/config/compiler/clang_version.hpp
@@ -2,7 +2,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt)

-#if !defined(__APPLE__)
+#if !defined(__apple_build_version__)

 # define BOOST_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__ % 100)

@@ -11,7 +11,13 @@

 // https://en.wikipedia.org/wiki/Xcode#Toolchain_versions

-# if BOOST_CLANG_REPORTED_VERSION >= 140000
+# if BOOST_CLANG_REPORTED_VERSION >= 150000
+#   define BOOST_CLANG_VERSION 160000
+
+# elif BOOST_CLANG_REPORTED_VERSION >= 140003
+#   define BOOST_CLANG_VERSION 150000
+
+# elif BOOST_CLANG_REPORTED_VERSION >= 140000
 #   define BOOST_CLANG_VERSION 140000

 # elif BOOST_CLANG_REPORTED_VERSION >= 130100
Author	SHA1	Message	Date
jzmaddock	68b79c8148	Can't use clang 13 & 14 on focal.	2023-11-01 18:25:53 +00:00
jzmaddock	41861037ba	Try older clang on focal.	2023-11-01 18:23:05 +00:00
jzmaddock	92bd8da5d9	Adjust more clang and gcc versions...	2023-11-01 17:34:17 +00:00
jzmaddock	9cb28b27b1	spelling!	2023-11-01 17:19:48 +00:00
jzmaddock	6510d00af4	clang-12 doesn't work either.	2023-11-01 17:16:39 +00:00
jzmaddock	2f0185a709	More clang version fixes.	2023-11-01 17:12:48 +00:00
jzmaddock	c0c348c08e	Try again with clang versions.	2023-11-01 17:10:39 +00:00
jzmaddock	12aa23b23d	Update CI clang version now that gcc has changed.	2023-11-01 13:31:12 +00:00
jzmaddock	b35f77942d	Merge pull request #471 from boostorg/pr/gha-msvc140-cxxstd Update cxxstd values for GHA msvc jobs	2023-11-01 11:28:46 +00:00
jzmaddock	ce6e42df6f	Merge pull request #488 from boostorg/pr/boost-clang-version-2 Update BOOST_CLANG_VERSION for Xcode 14.3, 15.0, 15.1	2023-11-01 11:28:08 +00:00
Peter Dimov	1d2698c1f6	Update BOOST_CLANG_VERSION for Xcode 14.3, 15.0, 15.1	2023-10-25 15:24:23 +03:00
jzmaddock	a98574fc12	Merge pull request #487 from chrstphrchvz/patch-1 Use `__apple_build_version__` to detect Apple clang	2023-10-25 00:04:31 +01:00
Christopher Chavez	9c34fb6585	Use __apple_build_version__ to detect Apple clang …since __APPLE__ is defined by both Apple Clang and LLVM.org Clang on Apple platforms.	2023-10-20 17:15:12 -05:00
jzmaddock	54afd34839	Merge pull request #485 from boostorg/cpp23feature_test Add C++23 feature test macro support.	2023-10-14 09:26:22 +01:00
Peter Dimov	9f8fbf36a6	Update cxxstd values for GHA msvc jobs	2023-01-24 03:15:28 +02:00