Update ci workflows

This commit is contained in:
ado 2023-08-07 01:33:50 +02:00
parent d86c8e9fe8
commit e7045ce437
2 changed files with 9 additions and 9 deletions

View File

@ -23,8 +23,7 @@ jobs:
strategy: strategy:
matrix: matrix:
version: version: ['16', '15', '14', '13', '12', '11', '10', '9', '8', '7']
['latest', '16', '15', '14', '13', '12', '11', '10', '9', '8', '7']
type: [Release, Debug] type: [Release, Debug]
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -37,6 +36,8 @@ jobs:
options: -v /usr/local:/host_usr_local options: -v /usr/local:/host_usr_local
env: env:
CC: clang-${{ matrix.version }}
CXX: clang++-${{ matrix.version }}
CXXFLAGS: -stdlib=libc++ CXXFLAGS: -stdlib=libc++
steps: steps:
@ -55,9 +56,7 @@ jobs:
script/ci_install_deps.sh script/ci_install_deps.sh
- name: Configure - name: Configure
run: >- run: cmake -S test -B build -DCMAKE_BUILD_TYPE=${{matrix.type}}
cmake -DCMAKE_CXX_COMPILER=clang++ -S test -B build
-DCMAKE_BUILD_TYPE=${{matrix.type}}
- name: Build - name: Build
run: cmake --build build -j ${{steps.cores.outputs.count}} run: cmake --build build -j ${{steps.cores.outputs.count}}

View File

@ -17,8 +17,8 @@ on:
env: env:
URL_BASE: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431 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_BASEKIT_SCRIPT: l_BaseKit_p_2021.1.0.2659_offline.sh
LINUX_HPCKIT_URL: ${{URL_BASE}}/l_HPCKit_p_2021.1.0.2684_offline.sh LINUX_HPCKIT_SCRIPT: l_HPCKit_p_2021.1.0.2684_offline.sh
jobs: jobs:
icc_tests: icc_tests:
@ -46,13 +46,14 @@ jobs:
path: | path: |
/opt/intel/oneapi/compiler /opt/intel/oneapi/compiler
key: >- key: >-
install-${{env.LINUX_HPCKIT_URL}}- install-${{env.URL_BASE}}/${{env.LINUX_HPCKIT_SCRIPT}}-
${{env.LINUX_CPP_COMPONENTS_WEB}}- ${{env.LINUX_CPP_COMPONENTS_WEB}}-
compiler-${{hashFiles('**/scripts/cache_exclude_linux.sh')}} compiler-${{hashFiles('**/scripts/cache_exclude_linux.sh')}}
- name: Install icc - name: Install icc
run: >- 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 - name: CMake
run: echo "/host_usr_local/bin" >> $GITHUB_PATH run: echo "/host_usr_local/bin" >> $GITHUB_PATH