Update ci workflows

This commit is contained in:
ado 2023-08-07 01:49:49 +02:00
parent e7045ce437
commit f106889ada
2 changed files with 10 additions and 10 deletions

View File

@ -23,7 +23,8 @@ jobs:
strategy: strategy:
matrix: 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] type: [Release, Debug]
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -31,13 +32,13 @@ jobs:
name: "Clang ${{matrix.version}}: ${{matrix.type}}" name: "Clang ${{matrix.version}}: ${{matrix.type}}"
container: container:
image: teeks99/clang-ubuntu:${{matrix.version}} image: silkeh/clang:${{matrix.version}}
options: -v /usr/local:/host_usr_local options: -v /usr/local:/host_usr_local
env: env:
CC: clang-${{ matrix.version }} CC: clang
CXX: clang++-${{ matrix.version }} CXX: clang++
CXXFLAGS: -stdlib=libc++ CXXFLAGS: -stdlib=libc++
steps: steps:

View File

@ -16,9 +16,9 @@ on:
- bugfix/** - bugfix/**
env: env:
URL_BASE: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431 LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431/l_BaseKit_p_2021.1.0.2659_offline.sh
LINUX_BASEKIT_SCRIPT: l_BaseKit_p_2021.1.0.2659_offline.sh LINUX_HPCKIT_URL:
LINUX_HPCKIT_SCRIPT: l_HPCKit_p_2021.1.0.2684_offline.sh https://registrationcenter-download.intel.com/akdlm/irc_nas/17427/l_HPCKit_p_2021.1.0.2684_offline.sh
jobs: jobs:
icc_tests: icc_tests:
@ -46,14 +46,13 @@ jobs:
path: | path: |
/opt/intel/oneapi/compiler /opt/intel/oneapi/compiler
key: >- key: >-
install-${{env.URL_BASE}}/${{env.LINUX_HPCKIT_SCRIPT}}- install-${{env.LINUX_HPCKIT_URL}}-
${{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 ${URL_BASE}/${LINUX_HPCKIT_SCRIPT} script/ci_install_icc.sh $LINUX_HPCKIT_URL $LINUX_CPP_COMPONENTS_WEB
${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