From 479cf4bbe7cc2e8d39993ecf68153791aa42435f Mon Sep 17 00:00:00 2001 From: ado Date: Sun, 6 Aug 2023 23:23:32 +0200 Subject: [PATCH 01/30] Update clang and gcc ci --- .github/workflows/ubuntu-latest-clang.yml | 3 ++- .github/workflows/ubuntu-latest-gcc.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu-latest-clang.yml b/.github/workflows/ubuntu-latest-clang.yml index a01c763..6fce80c 100644 --- a/.github/workflows/ubuntu-latest-clang.yml +++ b/.github/workflows/ubuntu-latest-clang.yml @@ -23,7 +23,8 @@ jobs: strategy: matrix: - version: [11, 10, 9, 8, 7] + version: >- + ['latest', '16', '15', '14', '13', '12', '11', '10', '9', '8' '7'] runs-on: ubuntu-latest diff --git a/.github/workflows/ubuntu-latest-gcc.yml b/.github/workflows/ubuntu-latest-gcc.yml index 04959e6..7d1bde2 100644 --- a/.github/workflows/ubuntu-latest-gcc.yml +++ b/.github/workflows/ubuntu-latest-gcc.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: - version: [10, 9, 8] + version: ['latest', '13', '12', '11', '10', '9', '8'] runs-on: ubuntu-latest From 9afe24785b6100ba80ced1f117ebd9ba2a40df5d Mon Sep 17 00:00:00 2001 From: ado Date: Sun, 6 Aug 2023 23:41:44 +0200 Subject: [PATCH 02/30] Fix clang ci yaml --- .github/workflows/ubuntu-latest-clang.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu-latest-clang.yml b/.github/workflows/ubuntu-latest-clang.yml index 6fce80c..e4dd6e6 100644 --- a/.github/workflows/ubuntu-latest-clang.yml +++ b/.github/workflows/ubuntu-latest-clang.yml @@ -23,8 +23,8 @@ jobs: strategy: matrix: - version: >- - ['latest', '16', '15', '14', '13', '12', '11', '10', '9', '8' '7'] + version: + ['latest', '16', '15', '14', '13', '12', '11', '10', '9', '8', '7'] runs-on: ubuntu-latest From cd6c2df35936074aeb0584ea77fe496e4e26bcc2 Mon Sep 17 00:00:00 2001 From: ado Date: Sun, 6 Aug 2023 23:49:55 +0200 Subject: [PATCH 03/30] Update msys2-clang ci --- .github/workflows/win-msys2-clang.yml | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/.github/workflows/win-msys2-clang.yml b/.github/workflows/win-msys2-clang.yml index c13b862..3f2a806 100644 --- a/.github/workflows/win-msys2-clang.yml +++ b/.github/workflows/win-msys2-clang.yml @@ -22,40 +22,51 @@ jobs: ! contains(toJSON(github.event.commits.*.message), '[skip github]') name: ${{ matrix.msystem }} - runs-on: windows-latest + + runs-on: ${{ matrix.os }} + defaults: run: shell: msys2 {0} + strategy: fail-fast: false + matrix: + os: ['windows-2019', 'windows-latest'] + include: - msystem: "MINGW64" install: >- - git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja + git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-clang type: Release + - msystem: "MINGW32" install: >- - git mingw-w64-i686-cmake mingw-w64-i686-ninja + git mingw-w64-i686-cmake mingw-w64-i686-ninja mingw-w64-i686-clang type: Release + - msystem: "MINGW64" - install: >- - git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja + install: >- + git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-clang type: Debug + - msystem: "MINGW32" install: >- - git mingw-w64-i686-cmake mingw-w64-i686-ninja + git mingw-w64-i686-cmake mingw-w64-i686-ninja mingw-w64-i686-clang type: Debug + env: CMAKE_GENERATOR: Ninja steps: - uses: actions/checkout@v2 - uses: msys2/setup-msys2@v2 + with: update: true msystem: ${{ matrix.msystem }} @@ -65,8 +76,8 @@ jobs: run: script/ci_install_deps.sh - name: Configure - run: >- - cmake -DCMAKE_CXX_COMPILER=clang++ -S test -B build + run: >- + cmake -DCMAKE_CXX_COMPILER=clang++ -S test -B build -DCMAKE_BUILD_TYPE=Debug - name: Build From a1f01ec5cbedbb0f0fb81d5cc7c830818e4c63c2 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 00:44:43 +0200 Subject: [PATCH 04/30] Update clang ci --- .github/workflows/ubuntu-latest-clang.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ubuntu-latest-clang.yml b/.github/workflows/ubuntu-latest-clang.yml index e4dd6e6..5169bc2 100644 --- a/.github/workflows/ubuntu-latest-clang.yml +++ b/.github/workflows/ubuntu-latest-clang.yml @@ -35,11 +35,6 @@ jobs: options: -v /usr/local:/host_usr_local - env: - CC: clang-${{ matrix.version }} - CXX: clang++-${{ matrix.version }} - CXXFLAGS: -stdlib=libc++ - steps: - uses: actions/checkout@v1 From 236b5da9c245c7963c41261232a81226d63c48da Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 00:56:44 +0200 Subject: [PATCH 05/30] Update msys2-clang and msys2-gcc ci --- .github/workflows/win-msys2-clang.yml | 32 +++++++--------------- .github/workflows/win-msys2-gcc.yml | 39 +++++++++++++-------------- 2 files changed, 27 insertions(+), 44 deletions(-) diff --git a/.github/workflows/win-msys2-clang.yml b/.github/workflows/win-msys2-clang.yml index 3f2a806..8d2cbc1 100644 --- a/.github/workflows/win-msys2-clang.yml +++ b/.github/workflows/win-msys2-clang.yml @@ -21,9 +21,9 @@ jobs: ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && ! contains(toJSON(github.event.commits.*.message), '[skip github]') - name: ${{ matrix.msystem }} + name: "${{matrix.os}}:${{matrix.msystem}}:${{matrix.type}}" - runs-on: ${{ matrix.os }} + runs-on: ${{matrix.os}} defaults: run: @@ -33,32 +33,18 @@ jobs: fail-fast: false matrix: - os: ['windows-2019', 'windows-latest'] - + os: [windows-2019, windows-latest] + type: [Release, Debug] include: - msystem: "MINGW64" install: >- git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-clang - type: Release - msystem: "MINGW32" install: >- git mingw-w64-i686-cmake mingw-w64-i686-ninja mingw-w64-i686-clang - type: Release - - - msystem: "MINGW64" - install: >- - git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja - mingw-w64-x86_64-clang - type: Debug - - - msystem: "MINGW32" - install: >- - git mingw-w64-i686-cmake mingw-w64-i686-ninja - mingw-w64-i686-clang - type: Debug env: CMAKE_GENERATOR: Ninja @@ -69,8 +55,8 @@ jobs: with: update: true - msystem: ${{ matrix.msystem }} - install: ${{ matrix.install }} + msystem: ${{matrix.msystem}} + install: ${{ matrix.install}} - name: Install dependencies run: script/ci_install_deps.sh @@ -78,11 +64,11 @@ jobs: - name: Configure run: >- cmake -DCMAKE_CXX_COMPILER=clang++ -S test -B build - -DCMAKE_BUILD_TYPE=Debug + -DCMAKE_BUILD_TYPE=${{matrix.type}} - name: Build - run: cmake --build build -j ${{ steps.cores.outputs.count }} + run: cmake --build build -j ${{steps.cores.outputs.count}} - name: Run working-directory: build - run: ctest --output-on-failure -j ${{ steps.cores.outputs.count }} + run: ctest --output-on-failure -j ${{steps.cores.outputs.count}} diff --git a/.github/workflows/win-msys2-gcc.yml b/.github/workflows/win-msys2-gcc.yml index e4c6795..5e419d2 100644 --- a/.github/workflows/win-msys2-gcc.yml +++ b/.github/workflows/win-msys2-gcc.yml @@ -21,55 +21,52 @@ jobs: ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && ! contains(toJSON(github.event.commits.*.message), '[skip github]') - name: ${{ matrix.msystem }} - runs-on: windows-latest + name: "${{matrix.os}}:${{matrix.msystem}}:${{matrix.type}}" + + runs-on: ${{matrix.os}} + defaults: run: shell: msys2 {0} + strategy: fail-fast: false + matrix: + os: [windows-2019, windows-latest] + type: [Release, Debug] include: - msystem: "MINGW64" install: >- - git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja + git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-gcc - type: Release - - msystem: "MINGW32" - install: >- - git mingw-w64-i686-cmake mingw-w64-i686-ninja - mingw-w64-i686-gcc - type: Release - - msystem: "MINGW64" - install: >- - git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja - mingw-w64-x86_64-gcc - type: Debug + - msystem: "MINGW32" install: >- - git mingw-w64-i686-cmake mingw-w64-i686-ninja + git mingw-w64-i686-cmake mingw-w64-i686-ninja mingw-w64-i686-gcc - type: Debug + env: CMAKE_GENERATOR: Ninja steps: - uses: actions/checkout@v2 + - uses: msys2/setup-msys2@v2 with: update: true - msystem: ${{ matrix.msystem }} - install: ${{ matrix.install }} + msystem: ${{matrix.msystem}} + install: ${{matrix.install}} - name: Install dependencies run: script/ci_install_deps.sh - name: Configure - run: cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug + run: cmake -S test -B build -D CMAKE_BUILD_TYPE=${{matrix.type}} - name: Build - run: cmake --build build -j ${{ steps.cores.outputs.count }} + run: cmake --build build -j ${{steps.cores.outputs.count}} - name: Run working-directory: build - run: ctest --output-on-failure -j ${{ steps.cores.outputs.count }} + run: ctest --output-on-failure -j ${{steps.cores.outputs.count}} From 07373ea0436528611b2c466f5054560d88462912 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 01:09:37 +0200 Subject: [PATCH 06/30] Update ci workflows --- .github/workflows/ubuntu-latest-clang.yml | 13 +++-- .github/workflows/ubuntu-latest-gcc.yml | 11 ++-- .github/workflows/ubuntu-latest-icc.yml | 64 ++++++++++++----------- .github/workflows/win-msvc.yml | 2 +- .github/workflows/win-msys2-clang.yml | 3 +- 5 files changed, 50 insertions(+), 43 deletions(-) diff --git a/.github/workflows/ubuntu-latest-clang.yml b/.github/workflows/ubuntu-latest-clang.yml index 5169bc2..065d7c3 100644 --- a/.github/workflows/ubuntu-latest-clang.yml +++ b/.github/workflows/ubuntu-latest-clang.yml @@ -25,13 +25,14 @@ jobs: matrix: version: ['latest', '16', '15', '14', '13', '12', '11', '10', '9', '8', '7'] + type: [Release, Debug] runs-on: ubuntu-latest - name: Clang ${{ matrix.version }} + name: Clang "${{matrix.version}}:${{matrix.type}}" container: - image: teeks99/clang-ubuntu:${{ matrix.version }} + image: teeks99/clang-ubuntu:${{matrix.version}} options: -v /usr/local:/host_usr_local @@ -51,11 +52,13 @@ jobs: script/ci_install_deps.sh - name: Configure - run: cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug + run: >- + cmake -DCMAKE_CXX_COMPILER=clang++ -S test -B build + -DCMAKE_BUILD_TYPE=${{matrix.type}} - name: Build - run: cmake --build build -j ${{ steps.cores.outputs.count }} + run: cmake --build build -j ${{steps.cores.outputs.count}} - name: Run working-directory: build - run: ctest --output-on-failure -j ${{ steps.cores.outputs.count }} + run: ctest --output-on-failure -j ${{steps.cores.outputs.count}} diff --git a/.github/workflows/ubuntu-latest-gcc.yml b/.github/workflows/ubuntu-latest-gcc.yml index 7d1bde2..c16eff6 100644 --- a/.github/workflows/ubuntu-latest-gcc.yml +++ b/.github/workflows/ubuntu-latest-gcc.yml @@ -24,13 +24,14 @@ jobs: strategy: matrix: version: ['latest', '13', '12', '11', '10', '9', '8'] + type: [Release, Debug] runs-on: ubuntu-latest - name: GCC ${{ matrix.version }} + name: GCC "${{matrix.version}}:${{matrix.type}}" container: - image: gcc:${{ matrix.version }} + image: gcc:${{matrix.version}} options: -v /usr/local:/host_usr_local @@ -47,11 +48,11 @@ jobs: run: script/ci_install_deps.sh - name: Configure - run: cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug + run: cmake -S test -B build -D CMAKE_BUILD_TYPE=${{matrix.type}} - name: Build - run: cmake --build build -j ${{ steps.cores.outputs.count }} + run: cmake --build build -j ${{steps.cores.outputs.count}} - name: Run working-directory: build - run: ctest --output-on-failure -j ${{ steps.cores.outputs.count }} + run: ctest --output-on-failure -j ${{steps.cores.outputs.count}} diff --git a/.github/workflows/ubuntu-latest-icc.yml b/.github/workflows/ubuntu-latest-icc.yml index 4bd3b0d..6da90b1 100644 --- a/.github/workflows/ubuntu-latest-icc.yml +++ b/.github/workflows/ubuntu-latest-icc.yml @@ -16,9 +16,9 @@ on: - bugfix/** env: - LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431/l_BaseKit_p_2021.1.0.2659_offline.sh - LINUX_HPCKIT_URL: - https://registrationcenter-download.intel.com/akdlm/irc_nas/17427/l_HPCKit_p_2021.1.0.2684_offline.sh + URL_BASE: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431 + LINUX_BASEKIT_URL: ${URL_BASE}/l_BaseKit_p_2021.1.0.2659_offline.sh + LINUX_HPCKIT_URL: ${URL_BASE}/l_HPCKit_p_2021.1.0.2684_offline.sh jobs: icc_tests: @@ -27,6 +27,7 @@ jobs: ! contains(toJSON(github.event.commits.*.message), '[skip github]') runs-on: ubuntu-latest + defaults: run: shell: bash @@ -36,38 +37,39 @@ jobs: options: -v /usr/local:/host_usr_local steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: cache install - id: cache-install - uses: actions/cache@v2 - with: - path: | - /opt/intel/oneapi/compiler - key: >- - install-${{ env.LINUX_HPCKIT_URL }}- - ${{ env.LINUX_CPP_COMPONENTS_WEB }}- - compiler-${{ hashFiles('**/scripts/cache_exclude_linux.sh') }} + - name: cache install + id: cache-install + uses: actions/cache@v2 + with: + path: | + /opt/intel/oneapi/compiler + key: >- + install-${{env.LINUX_HPCKIT_URL}}- + ${{env.LINUX_CPP_COMPONENTS_WEB}}- + compiler-${{hashFiles('**/scripts/cache_exclude_linux.sh')}} - - name: Install icc - run: script/ci_install_icc.sh $LINUX_HPCKIT_URL $LINUX_CPP_COMPONENTS_WEB + - name: Install icc + run: >- + script/ci_install_icc.sh $LINUX_HPCKIT_URL $LINUX_CPP_COMPONENTS_WEB - - name: CMake - run: echo "/host_usr_local/bin" >> $GITHUB_PATH + - name: CMake + run: echo "/host_usr_local/bin" >> $GITHUB_PATH - - name: Install dependencies - run: script/ci_install_deps.sh + - name: Install dependencies + run: script/ci_install_deps.sh - - name: Configure - run: >- - source script/ci_setup_icc.sh && - cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug + - name: Configure + run: >- + source script/ci_setup_icc.sh && + cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug - - name: Build - run: >- - source script/ci_setup_icc.sh && - cmake --build build -j ${{ steps.cores.outputs.count }} + - name: Build + run: >- + source script/ci_setup_icc.sh && + cmake --build build -j ${{steps.cores.outputs.count}} - - name: Run - working-directory: build - run: ctest --output-on-failure -j ${{ steps.cores.outputs.count }} + - name: Run + working-directory: build + run: ctest --output-on-failure -j ${{steps.cores.outputs.count}} diff --git a/.github/workflows/win-msvc.yml b/.github/workflows/win-msvc.yml index 5311925..dd54c1a 100644 --- a/.github/workflows/win-msvc.yml +++ b/.github/workflows/win-msvc.yml @@ -25,7 +25,7 @@ jobs: run: shell: bash - runs-on: ${{ matrix.config.os }} + runs-on: ${{matrix.config.os}} strategy: fail-fast: false diff --git a/.github/workflows/win-msys2-clang.yml b/.github/workflows/win-msys2-clang.yml index 8d2cbc1..727c4d8 100644 --- a/.github/workflows/win-msys2-clang.yml +++ b/.github/workflows/win-msys2-clang.yml @@ -51,12 +51,13 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: msys2/setup-msys2@v2 with: update: true msystem: ${{matrix.msystem}} - install: ${{ matrix.install}} + install: ${{matrix.install}} - name: Install dependencies run: script/ci_install_deps.sh From 80c189f9c578d214541321207e4df4e6055863ea Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 01:16:45 +0200 Subject: [PATCH 07/30] Update ci workflows --- .github/workflows/ubuntu-latest-clang.yml | 2 +- .github/workflows/ubuntu-latest-gcc.yml | 2 +- .github/workflows/ubuntu-latest-icc.yml | 4 ++-- .github/workflows/win-msvc.yml | 2 +- .github/workflows/win-msys2-clang.yml | 2 +- .github/workflows/win-msys2-gcc.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ubuntu-latest-clang.yml b/.github/workflows/ubuntu-latest-clang.yml index 065d7c3..55cad8a 100644 --- a/.github/workflows/ubuntu-latest-clang.yml +++ b/.github/workflows/ubuntu-latest-clang.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest - name: Clang "${{matrix.version}}:${{matrix.type}}" + name: Clang ${{matrix.version}}: ${{matrix.type}} container: image: teeks99/clang-ubuntu:${{matrix.version}} diff --git a/.github/workflows/ubuntu-latest-gcc.yml b/.github/workflows/ubuntu-latest-gcc.yml index c16eff6..0adcdd3 100644 --- a/.github/workflows/ubuntu-latest-gcc.yml +++ b/.github/workflows/ubuntu-latest-gcc.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest - name: GCC "${{matrix.version}}:${{matrix.type}}" + name: GCC ${{matrix.version}}: ${{matrix.type}} container: image: gcc:${{matrix.version}} diff --git a/.github/workflows/ubuntu-latest-icc.yml b/.github/workflows/ubuntu-latest-icc.yml index 6da90b1..fe02c9e 100644 --- a/.github/workflows/ubuntu-latest-icc.yml +++ b/.github/workflows/ubuntu-latest-icc.yml @@ -17,8 +17,8 @@ on: env: URL_BASE: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431 - LINUX_BASEKIT_URL: ${URL_BASE}/l_BaseKit_p_2021.1.0.2659_offline.sh - LINUX_HPCKIT_URL: ${URL_BASE}/l_HPCKit_p_2021.1.0.2684_offline.sh + LINUX_BASEKIT_URL: ${env.URL_BASE}/l_BaseKit_p_2021.1.0.2659_offline.sh + LINUX_HPCKIT_URL: ${env.URL_BASE}/l_HPCKit_p_2021.1.0.2684_offline.sh jobs: icc_tests: diff --git a/.github/workflows/win-msvc.yml b/.github/workflows/win-msvc.yml index dd54c1a..5f3d89b 100644 --- a/.github/workflows/win-msvc.yml +++ b/.github/workflows/win-msvc.yml @@ -40,7 +40,7 @@ jobs: build: [Debug, Release] platform: [Win32, x64] - name: "${{matrix.config.vs}}:${{matrix.platform}}:${{matrix.build}}" + name: ${{matrix.config.vs}}: ${{matrix.platform}}: ${{matrix.build}} steps: - name: checkout diff --git a/.github/workflows/win-msys2-clang.yml b/.github/workflows/win-msys2-clang.yml index 727c4d8..68c59eb 100644 --- a/.github/workflows/win-msys2-clang.yml +++ b/.github/workflows/win-msys2-clang.yml @@ -21,7 +21,7 @@ jobs: ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && ! contains(toJSON(github.event.commits.*.message), '[skip github]') - name: "${{matrix.os}}:${{matrix.msystem}}:${{matrix.type}}" + name: ${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}} runs-on: ${{matrix.os}} diff --git a/.github/workflows/win-msys2-gcc.yml b/.github/workflows/win-msys2-gcc.yml index 5e419d2..a30077a 100644 --- a/.github/workflows/win-msys2-gcc.yml +++ b/.github/workflows/win-msys2-gcc.yml @@ -21,7 +21,7 @@ jobs: ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && ! contains(toJSON(github.event.commits.*.message), '[skip github]') - name: "${{matrix.os}}:${{matrix.msystem}}:${{matrix.type}}" + name: ${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}} runs-on: ${{matrix.os}} From c0ef691889e10cedb27f162806443f5031ce7582 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 01:21:05 +0200 Subject: [PATCH 08/30] Update ci workflows --- .github/workflows/ubuntu-latest-clang.yml | 2 +- .github/workflows/ubuntu-latest-gcc.yml | 2 +- .github/workflows/ubuntu-latest-icc.yml | 4 ++-- .github/workflows/win-msvc.yml | 2 +- .github/workflows/win-msys2-clang.yml | 2 +- .github/workflows/win-msys2-gcc.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ubuntu-latest-clang.yml b/.github/workflows/ubuntu-latest-clang.yml index 55cad8a..c48b309 100644 --- a/.github/workflows/ubuntu-latest-clang.yml +++ b/.github/workflows/ubuntu-latest-clang.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest - name: Clang ${{matrix.version}}: ${{matrix.type}} + name: "Clang ${{matrix.version}}: ${{matrix.type}}" container: image: teeks99/clang-ubuntu:${{matrix.version}} diff --git a/.github/workflows/ubuntu-latest-gcc.yml b/.github/workflows/ubuntu-latest-gcc.yml index 0adcdd3..8cc83f2 100644 --- a/.github/workflows/ubuntu-latest-gcc.yml +++ b/.github/workflows/ubuntu-latest-gcc.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest - name: GCC ${{matrix.version}}: ${{matrix.type}} + name: "GCC ${{matrix.version}}: ${{matrix.type}}" container: image: gcc:${{matrix.version}} diff --git a/.github/workflows/ubuntu-latest-icc.yml b/.github/workflows/ubuntu-latest-icc.yml index fe02c9e..9bbcce2 100644 --- a/.github/workflows/ubuntu-latest-icc.yml +++ b/.github/workflows/ubuntu-latest-icc.yml @@ -17,8 +17,8 @@ on: env: URL_BASE: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431 - LINUX_BASEKIT_URL: ${env.URL_BASE}/l_BaseKit_p_2021.1.0.2659_offline.sh - LINUX_HPCKIT_URL: ${env.URL_BASE}/l_HPCKit_p_2021.1.0.2684_offline.sh + LINUX_BASEKIT_URL: ${{env.URL_BASE}}/l_BaseKit_p_2021.1.0.2659_offline.sh + LINUX_HPCKIT_URL: ${{env.URL_BASE}}/l_HPCKit_p_2021.1.0.2684_offline.sh jobs: icc_tests: diff --git a/.github/workflows/win-msvc.yml b/.github/workflows/win-msvc.yml index 5f3d89b..9225249 100644 --- a/.github/workflows/win-msvc.yml +++ b/.github/workflows/win-msvc.yml @@ -40,7 +40,7 @@ jobs: build: [Debug, Release] platform: [Win32, x64] - name: ${{matrix.config.vs}}: ${{matrix.platform}}: ${{matrix.build}} + name: "${{matrix.config.vs}}: ${{matrix.platform}}: ${{matrix.build}}" steps: - name: checkout diff --git a/.github/workflows/win-msys2-clang.yml b/.github/workflows/win-msys2-clang.yml index 68c59eb..dfdf134 100644 --- a/.github/workflows/win-msys2-clang.yml +++ b/.github/workflows/win-msys2-clang.yml @@ -21,7 +21,7 @@ jobs: ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && ! contains(toJSON(github.event.commits.*.message), '[skip github]') - name: ${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}} + name: "${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}}" runs-on: ${{matrix.os}} diff --git a/.github/workflows/win-msys2-gcc.yml b/.github/workflows/win-msys2-gcc.yml index a30077a..7cd4406 100644 --- a/.github/workflows/win-msys2-gcc.yml +++ b/.github/workflows/win-msys2-gcc.yml @@ -21,7 +21,7 @@ jobs: ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && ! contains(toJSON(github.event.commits.*.message), '[skip github]') - name: ${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}} + name: "${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}}" runs-on: ${{matrix.os}} From d86c8e9fe873cc6d97c16647b8f3ccf5a7433555 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 01:26:40 +0200 Subject: [PATCH 09/30] Update ci workflows --- .github/workflows/ubuntu-latest-clang.yml | 3 +++ .github/workflows/ubuntu-latest-icc.yml | 4 ++-- .github/workflows/win-msvc.yml | 4 ++-- .github/workflows/win-msys2-clang.yml | 8 ++++---- .github/workflows/win-msys2-gcc.yml | 8 ++++---- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ubuntu-latest-clang.yml b/.github/workflows/ubuntu-latest-clang.yml index c48b309..6615263 100644 --- a/.github/workflows/ubuntu-latest-clang.yml +++ b/.github/workflows/ubuntu-latest-clang.yml @@ -36,6 +36,9 @@ jobs: options: -v /usr/local:/host_usr_local + env: + CXXFLAGS: -stdlib=libc++ + steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/ubuntu-latest-icc.yml b/.github/workflows/ubuntu-latest-icc.yml index 9bbcce2..553c1c2 100644 --- a/.github/workflows/ubuntu-latest-icc.yml +++ b/.github/workflows/ubuntu-latest-icc.yml @@ -17,8 +17,8 @@ on: env: URL_BASE: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431 - LINUX_BASEKIT_URL: ${{env.URL_BASE}}/l_BaseKit_p_2021.1.0.2659_offline.sh - LINUX_HPCKIT_URL: ${{env.URL_BASE}}/l_HPCKit_p_2021.1.0.2684_offline.sh + LINUX_BASEKIT_URL: ${{URL_BASE}}/l_BaseKit_p_2021.1.0.2659_offline.sh + LINUX_HPCKIT_URL: ${{URL_BASE}}/l_HPCKit_p_2021.1.0.2684_offline.sh jobs: icc_tests: diff --git a/.github/workflows/win-msvc.yml b/.github/workflows/win-msvc.yml index 9225249..abd2275 100644 --- a/.github/workflows/win-msvc.yml +++ b/.github/workflows/win-msvc.yml @@ -25,8 +25,6 @@ jobs: run: shell: bash - runs-on: ${{matrix.config.os}} - strategy: fail-fast: false matrix: @@ -40,6 +38,8 @@ jobs: build: [Debug, Release] platform: [Win32, x64] + runs-on: ${{matrix.config.os}} + name: "${{matrix.config.vs}}: ${{matrix.platform}}: ${{matrix.build}}" steps: diff --git a/.github/workflows/win-msys2-clang.yml b/.github/workflows/win-msys2-clang.yml index dfdf134..7761430 100644 --- a/.github/workflows/win-msys2-clang.yml +++ b/.github/workflows/win-msys2-clang.yml @@ -21,10 +21,6 @@ jobs: ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && ! contains(toJSON(github.event.commits.*.message), '[skip github]') - name: "${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}}" - - runs-on: ${{matrix.os}} - defaults: run: shell: msys2 {0} @@ -46,6 +42,10 @@ jobs: git mingw-w64-i686-cmake mingw-w64-i686-ninja mingw-w64-i686-clang + runs-on: ${{matrix.os}} + + name: "${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}}" + env: CMAKE_GENERATOR: Ninja diff --git a/.github/workflows/win-msys2-gcc.yml b/.github/workflows/win-msys2-gcc.yml index 7cd4406..e571e9b 100644 --- a/.github/workflows/win-msys2-gcc.yml +++ b/.github/workflows/win-msys2-gcc.yml @@ -21,10 +21,6 @@ jobs: ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && ! contains(toJSON(github.event.commits.*.message), '[skip github]') - name: "${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}}" - - runs-on: ${{matrix.os}} - defaults: run: shell: msys2 {0} @@ -46,6 +42,10 @@ jobs: git mingw-w64-i686-cmake mingw-w64-i686-ninja mingw-w64-i686-gcc + runs-on: ${{matrix.os}} + + name: "${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}}" + env: CMAKE_GENERATOR: Ninja From e7045ce4377297b3c55801a8dfcaec17b98db90c Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 01:33:50 +0200 Subject: [PATCH 10/30] Update ci workflows --- .github/workflows/ubuntu-latest-clang.yml | 9 ++++----- .github/workflows/ubuntu-latest-icc.yml | 9 +++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ubuntu-latest-clang.yml b/.github/workflows/ubuntu-latest-clang.yml index 6615263..3056042 100644 --- a/.github/workflows/ubuntu-latest-clang.yml +++ b/.github/workflows/ubuntu-latest-clang.yml @@ -23,8 +23,7 @@ jobs: strategy: matrix: - version: - ['latest', '16', '15', '14', '13', '12', '11', '10', '9', '8', '7'] + version: ['16', '15', '14', '13', '12', '11', '10', '9', '8', '7'] type: [Release, Debug] runs-on: ubuntu-latest @@ -37,6 +36,8 @@ jobs: options: -v /usr/local:/host_usr_local env: + CC: clang-${{ matrix.version }} + CXX: clang++-${{ matrix.version }} CXXFLAGS: -stdlib=libc++ steps: @@ -55,9 +56,7 @@ jobs: script/ci_install_deps.sh - name: Configure - run: >- - cmake -DCMAKE_CXX_COMPILER=clang++ -S test -B build - -DCMAKE_BUILD_TYPE=${{matrix.type}} + run: cmake -S test -B build -DCMAKE_BUILD_TYPE=${{matrix.type}} - name: Build run: cmake --build build -j ${{steps.cores.outputs.count}} diff --git a/.github/workflows/ubuntu-latest-icc.yml b/.github/workflows/ubuntu-latest-icc.yml index 553c1c2..5d4a0d2 100644 --- a/.github/workflows/ubuntu-latest-icc.yml +++ b/.github/workflows/ubuntu-latest-icc.yml @@ -17,8 +17,8 @@ on: env: URL_BASE: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431 - LINUX_BASEKIT_URL: ${{URL_BASE}}/l_BaseKit_p_2021.1.0.2659_offline.sh - LINUX_HPCKIT_URL: ${{URL_BASE}}/l_HPCKit_p_2021.1.0.2684_offline.sh + LINUX_BASEKIT_SCRIPT: l_BaseKit_p_2021.1.0.2659_offline.sh + LINUX_HPCKIT_SCRIPT: l_HPCKit_p_2021.1.0.2684_offline.sh jobs: icc_tests: @@ -46,13 +46,14 @@ jobs: path: | /opt/intel/oneapi/compiler key: >- - install-${{env.LINUX_HPCKIT_URL}}- + install-${{env.URL_BASE}}/${{env.LINUX_HPCKIT_SCRIPT}}- ${{env.LINUX_CPP_COMPONENTS_WEB}}- compiler-${{hashFiles('**/scripts/cache_exclude_linux.sh')}} - name: Install icc run: >- - script/ci_install_icc.sh $LINUX_HPCKIT_URL $LINUX_CPP_COMPONENTS_WEB + script/ci_install_icc.sh ${URL_BASE}/${LINUX_HPCKIT_SCRIPT} + ${URL_BASE}/${LINUX_CPP_COMPONENTS_WEB} - name: CMake run: echo "/host_usr_local/bin" >> $GITHUB_PATH From f106889adab438c5f834b2753e06575277c25b7a Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 01:49:49 +0200 Subject: [PATCH 11/30] Update ci workflows --- .github/workflows/ubuntu-latest-clang.yml | 9 +++++---- .github/workflows/ubuntu-latest-icc.yml | 11 +++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ubuntu-latest-clang.yml b/.github/workflows/ubuntu-latest-clang.yml index 3056042..66345af 100644 --- a/.github/workflows/ubuntu-latest-clang.yml +++ b/.github/workflows/ubuntu-latest-clang.yml @@ -23,7 +23,8 @@ jobs: strategy: matrix: - version: ['16', '15', '14', '13', '12', '11', '10', '9', '8', '7'] + version: + ['latest', '16', '15', '14', '13', '12', '11', '10', '9', '8', '7'] type: [Release, Debug] runs-on: ubuntu-latest @@ -31,13 +32,13 @@ jobs: name: "Clang ${{matrix.version}}: ${{matrix.type}}" container: - image: teeks99/clang-ubuntu:${{matrix.version}} + image: silkeh/clang:${{matrix.version}} options: -v /usr/local:/host_usr_local env: - CC: clang-${{ matrix.version }} - CXX: clang++-${{ matrix.version }} + CC: clang + CXX: clang++ CXXFLAGS: -stdlib=libc++ steps: diff --git a/.github/workflows/ubuntu-latest-icc.yml b/.github/workflows/ubuntu-latest-icc.yml index 5d4a0d2..6629d82 100644 --- a/.github/workflows/ubuntu-latest-icc.yml +++ b/.github/workflows/ubuntu-latest-icc.yml @@ -16,9 +16,9 @@ on: - bugfix/** env: - URL_BASE: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431 - LINUX_BASEKIT_SCRIPT: l_BaseKit_p_2021.1.0.2659_offline.sh - LINUX_HPCKIT_SCRIPT: l_HPCKit_p_2021.1.0.2684_offline.sh + LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431/l_BaseKit_p_2021.1.0.2659_offline.sh + LINUX_HPCKIT_URL: + https://registrationcenter-download.intel.com/akdlm/irc_nas/17427/l_HPCKit_p_2021.1.0.2684_offline.sh jobs: icc_tests: @@ -46,14 +46,13 @@ jobs: path: | /opt/intel/oneapi/compiler key: >- - install-${{env.URL_BASE}}/${{env.LINUX_HPCKIT_SCRIPT}}- + install-${{env.LINUX_HPCKIT_URL}}- ${{env.LINUX_CPP_COMPONENTS_WEB}}- compiler-${{hashFiles('**/scripts/cache_exclude_linux.sh')}} - name: Install icc run: >- - script/ci_install_icc.sh ${URL_BASE}/${LINUX_HPCKIT_SCRIPT} - ${URL_BASE}/${LINUX_CPP_COMPONENTS_WEB} + script/ci_install_icc.sh $LINUX_HPCKIT_URL $LINUX_CPP_COMPONENTS_WEB - name: CMake run: echo "/host_usr_local/bin" >> $GITHUB_PATH From 535138d9b897eda61c14fe31fabe2fca377d5541 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 02:16:48 +0200 Subject: [PATCH 12/30] Update ci workflows --- .github/workflows/ubuntu-latest-clang.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu-latest-clang.yml b/.github/workflows/ubuntu-latest-clang.yml index 66345af..df855ad 100644 --- a/.github/workflows/ubuntu-latest-clang.yml +++ b/.github/workflows/ubuntu-latest-clang.yml @@ -23,8 +23,10 @@ jobs: strategy: matrix: + # cmake clang12 is not able to compile a simple test program. + # /usr/bin/ld: cannot find -lunwind version: - ['latest', '16', '15', '14', '13', '12', '11', '10', '9', '8', '7'] + ['latest', '16', '15', '14', '13', '11', '10', '9', '8', '7'] type: [Release, Debug] runs-on: ubuntu-latest From dcf7e924ad86d1b740802e122a792814c0fd63aa Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 16:05:51 +0200 Subject: [PATCH 13/30] Update ci workflows --- .github/workflows/win-msys2-clang.yml | 8 ++++---- .github/workflows/win-msys2-gcc.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/win-msys2-clang.yml b/.github/workflows/win-msys2-clang.yml index 7761430..ba73261 100644 --- a/.github/workflows/win-msys2-clang.yml +++ b/.github/workflows/win-msys2-clang.yml @@ -31,7 +31,7 @@ jobs: matrix: os: [windows-2019, windows-latest] type: [Release, Debug] - include: + config: - msystem: "MINGW64" install: >- git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja @@ -44,7 +44,7 @@ jobs: runs-on: ${{matrix.os}} - name: "${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}}" + name: "${{matrix.config.msystem}}: ${{matrix.os}}: ${{matrix.type}}" env: CMAKE_GENERATOR: Ninja @@ -56,8 +56,8 @@ jobs: with: update: true - msystem: ${{matrix.msystem}} - install: ${{matrix.install}} + msystem: ${{matrix.config.msystem}} + install: ${{matrix.config.install}} - name: Install dependencies run: script/ci_install_deps.sh diff --git a/.github/workflows/win-msys2-gcc.yml b/.github/workflows/win-msys2-gcc.yml index e571e9b..cacdba0 100644 --- a/.github/workflows/win-msys2-gcc.yml +++ b/.github/workflows/win-msys2-gcc.yml @@ -31,7 +31,7 @@ jobs: matrix: os: [windows-2019, windows-latest] type: [Release, Debug] - include: + config: - msystem: "MINGW64" install: >- git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja @@ -44,7 +44,7 @@ jobs: runs-on: ${{matrix.os}} - name: "${{matrix.msystem}}: ${{matrix.os}}: ${{matrix.type}}" + name: "${{matrix.config.msystem}}: ${{matrix.os}}: ${{matrix.type}}" env: CMAKE_GENERATOR: Ninja @@ -55,8 +55,8 @@ jobs: - uses: msys2/setup-msys2@v2 with: update: true - msystem: ${{matrix.msystem}} - install: ${{matrix.install}} + msystem: ${{matrix.config.msystem}} + install: ${{matrix.config.install}} - name: Install dependencies run: script/ci_install_deps.sh From 9d7441b1783e00a8818fa6f2c6de595c1bd26ac6 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 16:53:04 +0200 Subject: [PATCH 14/30] Update ci workflows --- .github/workflows/win-msys2-clang.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/win-msys2-clang.yml b/.github/workflows/win-msys2-clang.yml index ba73261..da11273 100644 --- a/.github/workflows/win-msys2-clang.yml +++ b/.github/workflows/win-msys2-clang.yml @@ -53,7 +53,6 @@ jobs: - uses: actions/checkout@v2 - uses: msys2/setup-msys2@v2 - with: update: true msystem: ${{matrix.config.msystem}} From d37ec12bb540a1dd5a4b7ea659842509f979296a Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 17:28:53 +0200 Subject: [PATCH 15/30] [skip ci] Add single-header.yml --- .github/workflows/single-header.yml | 45 +++++++++++++++++++++++ .github/workflows/ubuntu-latest-clang.yml | 4 +- .github/workflows/ubuntu-latest-gcc.yml | 3 +- 3 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/single-header.yml diff --git a/.github/workflows/single-header.yml b/.github/workflows/single-header.yml new file mode 100644 index 0000000..1ad2ad4 --- /dev/null +++ b/.github/workflows/single-header.yml @@ -0,0 +1,45 @@ +name: single-header-ci + +on: + push: + branches: + - master + - feature/** + - improvement/** + - bugfix/** + + pull_request: + branches: + - master + - feature/** + - improvement/** + - bugfix/** + +jobs: + clang_tests: + #if: >- + #! contains(toJSON(github.event.commits.*.message), '[skip ci]') && + #! contains(toJSON(github.event.commits.*.message), '[skip github]') + + runs-on: ubuntu-latest + + name: "Single Header Test" +} + container: + image: gcc:latest + options: -v /usr/local:/host_usr_local + + steps: + - uses: actions/checkout@v1 + + - uses: friendlyanon/fetch-core-count@v1 + id: cores + + - name: Install dependencies + run: | + apt-get update + apt-get install -y git + script/ci_install_deps.sh + + - name: Single header update check + run: script/single_header_generator.py diff --git a/.github/workflows/ubuntu-latest-clang.yml b/.github/workflows/ubuntu-latest-clang.yml index df855ad..6785c36 100644 --- a/.github/workflows/ubuntu-latest-clang.yml +++ b/.github/workflows/ubuntu-latest-clang.yml @@ -25,8 +25,7 @@ jobs: matrix: # cmake clang12 is not able to compile a simple test program. # /usr/bin/ld: cannot find -lunwind - version: - ['latest', '16', '15', '14', '13', '11', '10', '9', '8', '7'] + version: ['latest', '15', '14', '13', '11', '10', '9', '8', '7'] type: [Release, Debug] runs-on: ubuntu-latest @@ -35,7 +34,6 @@ jobs: container: image: silkeh/clang:${{matrix.version}} - options: -v /usr/local:/host_usr_local env: diff --git a/.github/workflows/ubuntu-latest-gcc.yml b/.github/workflows/ubuntu-latest-gcc.yml index 8cc83f2..f5febd0 100644 --- a/.github/workflows/ubuntu-latest-gcc.yml +++ b/.github/workflows/ubuntu-latest-gcc.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: - version: ['latest', '13', '12', '11', '10', '9', '8'] + version: ['latest', '12', '11', '10', '9', '8'] type: [Release, Debug] runs-on: ubuntu-latest @@ -32,7 +32,6 @@ jobs: container: image: gcc:${{matrix.version}} - options: -v /usr/local:/host_usr_local steps: From 66f57ba66aa2ac6d7def2e1407ad5474fbdfcde8 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 17:34:28 +0200 Subject: [PATCH 16/30] Update single-header.yml --- .github/workflows/single-header.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/single-header.yml b/.github/workflows/single-header.yml index 1ad2ad4..4e8df79 100644 --- a/.github/workflows/single-header.yml +++ b/.github/workflows/single-header.yml @@ -16,10 +16,10 @@ on: - bugfix/** jobs: - clang_tests: - #if: >- - #! contains(toJSON(github.event.commits.*.message), '[skip ci]') && - #! contains(toJSON(github.event.commits.*.message), '[skip github]') + single_header_tests: + if: >- + ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && + ! contains(toJSON(github.event.commits.*.message), '[skip github]') runs-on: ubuntu-latest From c0e6e56364cb7fd7b570a2c8d281570e5800ac34 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 17:40:14 +0200 Subject: [PATCH 17/30] Update single-header.yml --- .github/workflows/single-header.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/single-header.yml b/.github/workflows/single-header.yml index 4e8df79..c55d353 100644 --- a/.github/workflows/single-header.yml +++ b/.github/workflows/single-header.yml @@ -18,13 +18,13 @@ on: jobs: single_header_tests: if: >- - ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && - ! contains(toJSON(github.event.commits.*.message), '[skip github]') + ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && + ! contains(toJSON(github.event.commits.*.message), '[skip github]') runs-on: ubuntu-latest name: "Single Header Test" -} + container: image: gcc:latest options: -v /usr/local:/host_usr_local From 3e3c922624750046d166476a482929bf4fc01239 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 17:45:03 +0200 Subject: [PATCH 18/30] [skip ci] Update single-header.yml --- .github/workflows/single-header.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/single-header.yml b/.github/workflows/single-header.yml index c55d353..ce6b241 100644 --- a/.github/workflows/single-header.yml +++ b/.github/workflows/single-header.yml @@ -17,9 +17,9 @@ on: jobs: single_header_tests: - if: >- - ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && - ! contains(toJSON(github.event.commits.*.message), '[skip github]') + #if: >- + # ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && + # ! contains(toJSON(github.event.commits.*.message), '[skip github]') runs-on: ubuntu-latest @@ -39,7 +39,6 @@ jobs: run: | apt-get update apt-get install -y git - script/ci_install_deps.sh - name: Single header update check run: script/single_header_generator.py From 55d1bbcf868e727ce846122ad2a20d647dcb003c Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 17:46:20 +0200 Subject: [PATCH 19/30] Update single-header.yml --- .github/workflows/single-header.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/single-header.yml b/.github/workflows/single-header.yml index ce6b241..8b401eb 100644 --- a/.github/workflows/single-header.yml +++ b/.github/workflows/single-header.yml @@ -17,9 +17,9 @@ on: jobs: single_header_tests: - #if: >- - # ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && - # ! contains(toJSON(github.event.commits.*.message), '[skip github]') + if: >- + ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && + ! contains(toJSON(github.event.commits.*.message), '[skip github]') runs-on: ubuntu-latest From 254bd24bbd6abedc7d706f774f5a10ef193e43a2 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 17:57:26 +0200 Subject: [PATCH 20/30] Update single-header.yml --- .github/workflows/single-header.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/single-header.yml b/.github/workflows/single-header.yml index 8b401eb..0c1fa39 100644 --- a/.github/workflows/single-header.yml +++ b/.github/workflows/single-header.yml @@ -41,4 +41,9 @@ jobs: apt-get install -y git - name: Single header update check - run: script/single_header_generator.py + run: | + script/single_header_generator.py > tmp.hpp + diff spp.hpp tmp.hpp + + - name: Single header compile check + run: ./test/test_single_header.sh From 8924ad12e587c5219d7b80bc3d9adf56f41fb1ae Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 18:00:28 +0200 Subject: [PATCH 21/30] Update single-header.yml --- .github/workflows/single-header.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/single-header.yml b/.github/workflows/single-header.yml index 0c1fa39..0956a21 100644 --- a/.github/workflows/single-header.yml +++ b/.github/workflows/single-header.yml @@ -43,7 +43,7 @@ jobs: - name: Single header update check run: | script/single_header_generator.py > tmp.hpp - diff spp.hpp tmp.hpp + diff ssp.hpp tmp.hpp - name: Single header compile check run: ./test/test_single_header.sh From 4139b50cd9bdf2e236b2bc663b32aec36746daef Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 18:04:38 +0200 Subject: [PATCH 22/30] Test single-header-ci --- ssp.hpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/ssp.hpp b/ssp.hpp index e6fbdba..033a0a2 100644 --- a/ssp.hpp +++ b/ssp.hpp @@ -13,9 +13,6 @@ #include #include #include -#include -#include -#define SSP_DISABLE_FAST_FLOAT namespace ss { From b9d8eb860e94640d223de18de2e6bb3c7d0fa0d0 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 18:30:35 +0200 Subject: [PATCH 23/30] [skip ci] Restore ssp.hpp --- ssp.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ssp.hpp b/ssp.hpp index 033a0a2..e6fbdba 100644 --- a/ssp.hpp +++ b/ssp.hpp @@ -13,6 +13,9 @@ #include #include #include +#include +#include +#define SSP_DISABLE_FAST_FLOAT namespace ss { From 3e3eb1b61cc46bf3848f3c71ac61f56d89f19391 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 18:33:38 +0200 Subject: [PATCH 24/30] [skip ci] Update single-header.yml --- .github/workflows/single-header.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/single-header.yml b/.github/workflows/single-header.yml index 0956a21..959149d 100644 --- a/.github/workflows/single-header.yml +++ b/.github/workflows/single-header.yml @@ -1,6 +1,8 @@ name: single-header-ci on: + workflow-dispatch + push: branches: - master From f1e127dd2b1edc96d31c63c76820736c03004aee Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 18:35:30 +0200 Subject: [PATCH 25/30] [skip ci] Update single-header.yml --- .github/workflows/single-header.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/single-header.yml b/.github/workflows/single-header.yml index 959149d..4470c19 100644 --- a/.github/workflows/single-header.yml +++ b/.github/workflows/single-header.yml @@ -1,7 +1,7 @@ name: single-header-ci on: - workflow-dispatch + workflow-dispatch: push: branches: From 7ba66ff99df0db45b707abae9ba0d61362c25518 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 18:36:38 +0200 Subject: [PATCH 26/30] Update single-header.yml --- .github/workflows/single-header.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/single-header.yml b/.github/workflows/single-header.yml index 4470c19..dbb7403 100644 --- a/.github/workflows/single-header.yml +++ b/.github/workflows/single-header.yml @@ -1,8 +1,6 @@ name: single-header-ci on: - workflow-dispatch: - push: branches: - master @@ -17,6 +15,8 @@ on: - improvement/** - bugfix/** + workflow-dispatch: + jobs: single_header_tests: if: >- From ffca94d47d64574e6bb4aac3499faab2b071c337 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 18:37:58 +0200 Subject: [PATCH 27/30] [skip ci] Update single-header.yml --- .github/workflows/single-header.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/single-header.yml b/.github/workflows/single-header.yml index dbb7403..87d7934 100644 --- a/.github/workflows/single-header.yml +++ b/.github/workflows/single-header.yml @@ -15,7 +15,7 @@ on: - improvement/** - bugfix/** - workflow-dispatch: + workflow_dispatch: jobs: single_header_tests: From 31b924736fe6f13dfb6591e6a4a5bd3c5e3840a4 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 18:39:02 +0200 Subject: [PATCH 28/30] [skip ci] Update single-header.yml --- .github/workflows/single-header.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/single-header.yml b/.github/workflows/single-header.yml index 87d7934..cb117fa 100644 --- a/.github/workflows/single-header.yml +++ b/.github/workflows/single-header.yml @@ -1,6 +1,8 @@ name: single-header-ci on: + workflow_dispatch: + push: branches: - master @@ -15,8 +17,6 @@ on: - improvement/** - bugfix/** - workflow_dispatch: - jobs: single_header_tests: if: >- From 65371d05f3d8ccd60d2a21d5a9a1271beb461ac5 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 18:40:54 +0200 Subject: [PATCH 29/30] Update single-header.yml --- .github/workflows/single-header.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/single-header.yml b/.github/workflows/single-header.yml index cb117fa..87d7934 100644 --- a/.github/workflows/single-header.yml +++ b/.github/workflows/single-header.yml @@ -1,8 +1,6 @@ name: single-header-ci on: - workflow_dispatch: - push: branches: - master @@ -17,6 +15,8 @@ on: - improvement/** - bugfix/** + workflow_dispatch: + jobs: single_header_tests: if: >- From 5f27595ec176153246f3534149350405fe5e89bf Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 18:48:21 +0200 Subject: [PATCH 30/30] Add workflow_dispatch to all workflows --- .github/workflows/single-header.yml | 4 ++-- .github/workflows/ubuntu-latest-clang.yml | 2 ++ .github/workflows/ubuntu-latest-gcc.yml | 2 ++ .github/workflows/ubuntu-latest-icc.yml | 2 ++ .github/workflows/win-msvc.yml | 2 ++ .github/workflows/win-msys2-clang.yml | 2 ++ .github/workflows/win-msys2-gcc.yml | 2 ++ 7 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/single-header.yml b/.github/workflows/single-header.yml index 87d7934..cb117fa 100644 --- a/.github/workflows/single-header.yml +++ b/.github/workflows/single-header.yml @@ -1,6 +1,8 @@ name: single-header-ci on: + workflow_dispatch: + push: branches: - master @@ -15,8 +17,6 @@ on: - improvement/** - bugfix/** - workflow_dispatch: - jobs: single_header_tests: if: >- diff --git a/.github/workflows/ubuntu-latest-clang.yml b/.github/workflows/ubuntu-latest-clang.yml index 6785c36..af97cab 100644 --- a/.github/workflows/ubuntu-latest-clang.yml +++ b/.github/workflows/ubuntu-latest-clang.yml @@ -1,6 +1,8 @@ name: ubuntu-latest-clang-ci on: + workflow_dispatch: + push: branches: - master diff --git a/.github/workflows/ubuntu-latest-gcc.yml b/.github/workflows/ubuntu-latest-gcc.yml index f5febd0..988c4b5 100644 --- a/.github/workflows/ubuntu-latest-gcc.yml +++ b/.github/workflows/ubuntu-latest-gcc.yml @@ -1,6 +1,8 @@ name: ubuntu-latest-gcc-ci on: + workflow_dispatch: + push: branches: - master diff --git a/.github/workflows/ubuntu-latest-icc.yml b/.github/workflows/ubuntu-latest-icc.yml index 6629d82..7589198 100644 --- a/.github/workflows/ubuntu-latest-icc.yml +++ b/.github/workflows/ubuntu-latest-icc.yml @@ -1,6 +1,8 @@ name: ubuntu-latest-icc-ci on: + workflow_dispatch: + push: branches: - master diff --git a/.github/workflows/win-msvc.yml b/.github/workflows/win-msvc.yml index abd2275..692af83 100644 --- a/.github/workflows/win-msvc.yml +++ b/.github/workflows/win-msvc.yml @@ -1,6 +1,8 @@ name: win-msvc-ci on: + workflow_dispatch: + push: branches: - master diff --git a/.github/workflows/win-msys2-clang.yml b/.github/workflows/win-msys2-clang.yml index da11273..1dc25d8 100644 --- a/.github/workflows/win-msys2-clang.yml +++ b/.github/workflows/win-msys2-clang.yml @@ -1,6 +1,8 @@ name: win-msys2-clang-ci on: + workflow_dispatch: + push: branches: - master diff --git a/.github/workflows/win-msys2-gcc.yml b/.github/workflows/win-msys2-gcc.yml index cacdba0..01d6906 100644 --- a/.github/workflows/win-msys2-gcc.yml +++ b/.github/workflows/win-msys2-gcc.yml @@ -1,6 +1,8 @@ name: win-msys2-gcc-ci on: + workflow_dispatch: + push: branches: - master