From 07373ea0436528611b2c466f5054560d88462912 Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 7 Aug 2023 01:09:37 +0200 Subject: [PATCH] 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