From 3a24a57c4ef7d5e6d552a79b6f5e1609d05a3360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Lamotte=20=28Klaim=29?= Date: Thu, 6 Apr 2023 17:59:21 +0200 Subject: [PATCH 01/11] ci: added gcc13 and clang17 testing --- .github/workflows/builds-and-tests.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/builds-and-tests.yaml b/.github/workflows/builds-and-tests.yaml index c9280b4..21d3720 100644 --- a/.github/workflows/builds-and-tests.yaml +++ b/.github/workflows/builds-and-tests.yaml @@ -8,12 +8,12 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest, macos-latest] - toolchain: [msvc, gcc, clang] + toolchain: [msvc, gcc, clang, clang12, gcc12] exclude: - os: ubuntu-latest toolchain: msvc - os: ubuntu-latest # TODO: Remove this one once the clang with libc++ is fixed - toolchain: clang + toolchain: clang clang12 - os: macos-latest toolchain: msvc - os: macos-latest # TODO: Remove this one once the clang of the system is fixed @@ -21,7 +21,7 @@ jobs: - os: macos-latest # TODO: Remove this one once the clang on macos is fixed toolchain: clang - os: windows-latest - toolchain: gcc + toolchain: gcc gcc12 name: Build & Run Tests runs-on: ${{ matrix.os }} @@ -59,17 +59,17 @@ jobs: platform: x64 - name: Install recent GCC - if: matrix.toolchain == 'gcc' + if: startsWith('gcc', matrix.toolchain) uses: egor-tensin/setup-gcc@v1 with: version: latest platform: x64 - name: Info about clang - if: matrix.toolchain == 'clang' + if: startswith('clang', matrix.toolchain) run: clang++ --version - name: Info about gcc - if: matrix.toolchain == 'gcc' + if: startsWith('gcc', matrix.toolchain) run: g++ --version # We omit trying to find `cl` from msvc because it's annoying, and the info is already in steps below. - name: Info about toolchain From 2c544629d4886785faaf92ae23fcb7cefe4d28bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Lamotte=20=28Klaim=29?= Date: Thu, 6 Apr 2023 18:49:43 +0200 Subject: [PATCH 02/11] ci: Fixed wrong clang version in workflow --- .github/workflows/builds-and-tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds-and-tests.yaml b/.github/workflows/builds-and-tests.yaml index 21d3720..b14e68a 100644 --- a/.github/workflows/builds-and-tests.yaml +++ b/.github/workflows/builds-and-tests.yaml @@ -8,12 +8,12 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest, macos-latest] - toolchain: [msvc, gcc, clang, clang12, gcc12] + toolchain: [msvc, gcc, clang, clang16, gcc12] exclude: - os: ubuntu-latest toolchain: msvc - os: ubuntu-latest # TODO: Remove this one once the clang with libc++ is fixed - toolchain: clang clang12 + toolchain: clang clang16 - os: macos-latest toolchain: msvc - os: macos-latest # TODO: Remove this one once the clang of the system is fixed From 59735e09893143a502a41b409b70795d1ff50915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Lamotte=20=28Klaim=29?= Date: Sat, 22 Apr 2023 16:07:30 +0200 Subject: [PATCH 03/11] Attempt to fix ci --- .github/workflows/builds-and-tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds-and-tests.yaml b/.github/workflows/builds-and-tests.yaml index b14e68a..ce8242f 100644 --- a/.github/workflows/builds-and-tests.yaml +++ b/.github/workflows/builds-and-tests.yaml @@ -13,7 +13,7 @@ jobs: - os: ubuntu-latest toolchain: msvc - os: ubuntu-latest # TODO: Remove this one once the clang with libc++ is fixed - toolchain: clang clang16 + toolchain: clang || clang16 - os: macos-latest toolchain: msvc - os: macos-latest # TODO: Remove this one once the clang of the system is fixed @@ -21,7 +21,7 @@ jobs: - os: macos-latest # TODO: Remove this one once the clang on macos is fixed toolchain: clang - os: windows-latest - toolchain: gcc gcc12 + toolchain: gcc || gcc12 name: Build & Run Tests runs-on: ${{ matrix.os }} From c290596eff6d300a21dcb931847c8499d3b397fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Lamotte=20=28Klaim=29?= Date: Sat, 22 Apr 2023 17:11:00 +0200 Subject: [PATCH 04/11] ci fix --- .github/workflows/builds-and-tests.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds-and-tests.yaml b/.github/workflows/builds-and-tests.yaml index ce8242f..b9cbfc3 100644 --- a/.github/workflows/builds-and-tests.yaml +++ b/.github/workflows/builds-and-tests.yaml @@ -13,7 +13,9 @@ jobs: - os: ubuntu-latest toolchain: msvc - os: ubuntu-latest # TODO: Remove this one once the clang with libc++ is fixed - toolchain: clang || clang16 + toolchain: clang + - os: ubuntu-latest + toolchain: clang16 - os: macos-latest toolchain: msvc - os: macos-latest # TODO: Remove this one once the clang of the system is fixed @@ -21,7 +23,9 @@ jobs: - os: macos-latest # TODO: Remove this one once the clang on macos is fixed toolchain: clang - os: windows-latest - toolchain: gcc || gcc12 + toolchain: gcc + - os: windows-latest + toolchain: gcc12 name: Build & Run Tests runs-on: ${{ matrix.os }} From c06b79685ff6002852dd04ff5ffbd28aa9f277a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Lamotte=20=28Klaim=29?= Date: Sat, 22 Apr 2023 18:21:47 +0200 Subject: [PATCH 05/11] Add compilers alias for specific versions --- .github/workflows/builds-and-tests.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/builds-and-tests.yaml b/.github/workflows/builds-and-tests.yaml index b9cbfc3..220a3bb 100644 --- a/.github/workflows/builds-and-tests.yaml +++ b/.github/workflows/builds-and-tests.yaml @@ -69,12 +69,22 @@ jobs: version: latest platform: x64 + - name: Clang version alias + if: ${{ matrix.toolchain }} == clang16 + run: alias clang-16=clang && alias clang++-16=clang++ + + - name: GCC version alias + if: ${{ matrix.toolchain }} == gcc12 + run: alias gcc-12=gcc && alias g++-12=g++ + - name: Info about clang if: startswith('clang', matrix.toolchain) run: clang++ --version + - name: Info about gcc if: startsWith('gcc', matrix.toolchain) run: g++ --version + # We omit trying to find `cl` from msvc because it's annoying, and the info is already in steps below. - name: Info about toolchain run: echo "Look into 'Create all build configurations' step for details about the toolchain." From dc969515801db64af4fda506685949c468628376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Lamotte=20=28Klaim=29?= Date: Sat, 22 Apr 2023 18:33:14 +0200 Subject: [PATCH 06/11] Attempt to setup aliases for clang-16 and gcc12 --- .github/workflows/builds-and-tests.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/builds-and-tests.yaml b/.github/workflows/builds-and-tests.yaml index 220a3bb..0f6b2e3 100644 --- a/.github/workflows/builds-and-tests.yaml +++ b/.github/workflows/builds-and-tests.yaml @@ -69,13 +69,13 @@ jobs: version: latest platform: x64 - - name: Clang version alias - if: ${{ matrix.toolchain }} == clang16 - run: alias clang-16=clang && alias clang++-16=clang++ + - name: Clang 16 version alias on non-linux OS + if: matrix.toolchain == clang16 && not statsWith('ubuntu', matrix.os) + run: sed -i -e "$aalias clang-16='clang'" ~/.bashrc && sed -i -e "$aalias clang++-16='clang++'" ~/.bashrc - - name: GCC version alias - if: ${{ matrix.toolchain }} == gcc12 - run: alias gcc-12=gcc && alias g++-12=g++ + - name: GCC 12 version alias on non-linux OS + if: matrix.toolchain == gcc12 && not statsWith('ubuntu', matrix.os) + run: sed -i -e "$aalias gcc-12='gcc'" ~/.bashrc && sed -i -e "$aalias g++-12='g++'" ~/.bashrc - name: Info about clang if: startswith('clang', matrix.toolchain) From da9870de781d99e23a4a84c7d5ba27bc301f2495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Lamotte=20=28Klaim=29?= Date: Sat, 22 Apr 2023 19:15:40 +0200 Subject: [PATCH 07/11] ci fixup --- .github/workflows/builds-and-tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds-and-tests.yaml b/.github/workflows/builds-and-tests.yaml index 0f6b2e3..b1e1bf3 100644 --- a/.github/workflows/builds-and-tests.yaml +++ b/.github/workflows/builds-and-tests.yaml @@ -70,11 +70,11 @@ jobs: platform: x64 - name: Clang 16 version alias on non-linux OS - if: matrix.toolchain == clang16 && not statsWith('ubuntu', matrix.os) + if: matrix.toolchain == 'clang16' && not statsWith('ubuntu', matrix.os) run: sed -i -e "$aalias clang-16='clang'" ~/.bashrc && sed -i -e "$aalias clang++-16='clang++'" ~/.bashrc - name: GCC 12 version alias on non-linux OS - if: matrix.toolchain == gcc12 && not statsWith('ubuntu', matrix.os) + if: matrix.toolchain == 'gcc12' && not statsWith('ubuntu', matrix.os) run: sed -i -e "$aalias gcc-12='gcc'" ~/.bashrc && sed -i -e "$aalias g++-12='g++'" ~/.bashrc - name: Info about clang From dda4c57e8adf487fd592889a48435fb2d12c3f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Lamotte=20=28Klaim=29?= Date: Sat, 22 Apr 2023 19:40:35 +0200 Subject: [PATCH 08/11] ci fixup --- .github/workflows/builds-and-tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds-and-tests.yaml b/.github/workflows/builds-and-tests.yaml index b1e1bf3..4916091 100644 --- a/.github/workflows/builds-and-tests.yaml +++ b/.github/workflows/builds-and-tests.yaml @@ -70,11 +70,11 @@ jobs: platform: x64 - name: Clang 16 version alias on non-linux OS - if: matrix.toolchain == 'clang16' && not statsWith('ubuntu', matrix.os) + if: matrix.toolchain == 'clang16' && !startsWith('ubuntu', matrix.os) run: sed -i -e "$aalias clang-16='clang'" ~/.bashrc && sed -i -e "$aalias clang++-16='clang++'" ~/.bashrc - name: GCC 12 version alias on non-linux OS - if: matrix.toolchain == 'gcc12' && not statsWith('ubuntu', matrix.os) + if: matrix.toolchain == 'gcc12' && !startsWith('ubuntu', matrix.os) run: sed -i -e "$aalias gcc-12='gcc'" ~/.bashrc && sed -i -e "$aalias g++-12='g++'" ~/.bashrc - name: Info about clang From e4234bae6838b4ff1c91c35fdf9904e344d50478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Lamotte=20=28Klaim=29?= Date: Sat, 22 Apr 2023 20:58:56 +0200 Subject: [PATCH 09/11] ci fixup --- .github/workflows/builds-and-tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds-and-tests.yaml b/.github/workflows/builds-and-tests.yaml index 4916091..d35a3ea 100644 --- a/.github/workflows/builds-and-tests.yaml +++ b/.github/workflows/builds-and-tests.yaml @@ -71,11 +71,11 @@ jobs: - name: Clang 16 version alias on non-linux OS if: matrix.toolchain == 'clang16' && !startsWith('ubuntu', matrix.os) - run: sed -i -e "$aalias clang-16='clang'" ~/.bashrc && sed -i -e "$aalias clang++-16='clang++'" ~/.bashrc + run: echo "$aalias clang-16='clang'" >> ~/.bashrc && echo "$aalias clang++-16='clang++'" >> ~/.bashrc - name: GCC 12 version alias on non-linux OS if: matrix.toolchain == 'gcc12' && !startsWith('ubuntu', matrix.os) - run: sed -i -e "$aalias gcc-12='gcc'" ~/.bashrc && sed -i -e "$aalias g++-12='g++'" ~/.bashrc + run: echo "$aalias gcc-12='gcc'" >> ~/.bashrc && echo "$aalias g++-12='g++'" >> ~/.bashrc - name: Info about clang if: startswith('clang', matrix.toolchain) From 48e114879fd4705b72afae352826b738ab8220e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Lamotte=20=28Klaim=29?= Date: Sun, 24 Sep 2023 15:31:08 +0200 Subject: [PATCH 10/11] fixup after rebase (clang17 gcc13) --- .github/workflows/builds-and-tests.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/builds-and-tests.yaml b/.github/workflows/builds-and-tests.yaml index d35a3ea..7fa1b3a 100644 --- a/.github/workflows/builds-and-tests.yaml +++ b/.github/workflows/builds-and-tests.yaml @@ -8,14 +8,14 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest, macos-latest] - toolchain: [msvc, gcc, clang, clang16, gcc12] + toolchain: [msvc, gcc, clang, clang17, gcc13] exclude: - os: ubuntu-latest toolchain: msvc - os: ubuntu-latest # TODO: Remove this one once the clang with libc++ is fixed toolchain: clang - os: ubuntu-latest - toolchain: clang16 + toolchain: clang17 - os: macos-latest toolchain: msvc - os: macos-latest # TODO: Remove this one once the clang of the system is fixed @@ -25,7 +25,7 @@ jobs: - os: windows-latest toolchain: gcc - os: windows-latest - toolchain: gcc12 + toolchain: gcc13 name: Build & Run Tests runs-on: ${{ matrix.os }} From 7677338e32d1f0d45b9d7275f9e36f509c08e0c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Lamotte=20=28Klaim=29?= Date: Sun, 24 Sep 2023 15:32:11 +0200 Subject: [PATCH 11/11] fixup --- .github/workflows/builds-and-tests.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/builds-and-tests.yaml b/.github/workflows/builds-and-tests.yaml index 7fa1b3a..39c24e1 100644 --- a/.github/workflows/builds-and-tests.yaml +++ b/.github/workflows/builds-and-tests.yaml @@ -69,13 +69,13 @@ jobs: version: latest platform: x64 - - name: Clang 16 version alias on non-linux OS - if: matrix.toolchain == 'clang16' && !startsWith('ubuntu', matrix.os) - run: echo "$aalias clang-16='clang'" >> ~/.bashrc && echo "$aalias clang++-16='clang++'" >> ~/.bashrc + - name: Clang 17 version alias on non-linux OS + if: matrix.toolchain == 'clang17' && !startsWith('ubuntu', matrix.os) + run: echo "$aalias clang-17='clang'" >> ~/.bashrc && echo "$aalias clang++-17='clang++'" >> ~/.bashrc - - name: GCC 12 version alias on non-linux OS - if: matrix.toolchain == 'gcc12' && !startsWith('ubuntu', matrix.os) - run: echo "$aalias gcc-12='gcc'" >> ~/.bashrc && echo "$aalias g++-12='g++'" >> ~/.bashrc + - name: GCC 13 version alias on non-linux OS + if: matrix.toolchain == 'gcc13' && !startsWith('ubuntu', matrix.os) + run: echo "$aalias gcc-13='gcc'" >> ~/.bashrc && echo "$aalias g++-13='g++'" >> ~/.bashrc - name: Info about clang if: startswith('clang', matrix.toolchain)