Skip to content

Commit

Permalink
Fix CI failures (#256)
Browse files Browse the repository at this point in the history
* Fixed MSVC compiler toolset version

* Disabled macos/gcc-13,g++-13 due to a problem with __API_AVAILABLE

* Updated docker images

* Updated actions to use Node.js 20
  • Loading branch information
Beanavil authored Jun 26, 2024
1 parent dcf7d4f commit f6f5aa5
Showing 1 changed file with 15 additions and 14 deletions.
29 changes: 15 additions & 14 deletions .github/workflows/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- GEN: Ninja Multi-Config
CONFIG: Release
IMAGE:
- streamhpc/opencl-sdk-intelcpu:ubuntu-22.04-20230717
- khronosgroup/docker-images:opencl-sdk-intelcpu-ubuntu-22.04.20230717
include:
- CMAKE: system
COMPILER:
Expand All @@ -71,7 +71,7 @@ jobs:
CONF:
GEN: Unix Makefiles
CONFIG: Debug
IMAGE: streamhpc/opencl-sdk-intelcpu:ubuntu-20.04-20230717
IMAGE: khronosgroup/docker-images:opencl-sdk-intelcpu-ubuntu-20.04.20230717
- CMAKE: system
COMPILER:
C_NAME: gcc
Expand All @@ -82,7 +82,7 @@ jobs:
CONF:
GEN: Unix Makefiles
CONFIG: Release
IMAGE: streamhpc/opencl-sdk-intelcpu:ubuntu-20.04-20230717
IMAGE: khronosgroup/docker-images:opencl-sdk-intelcpu-ubuntu-20.04.20230717
- CMAKE: system
COMPILER:
C_NAME: gcc
Expand All @@ -93,7 +93,7 @@ jobs:
CONF:
GEN: Unix Makefiles
CONFIG: Debug
IMAGE: streamhpc/opencl-sdk-intelcpu:ubuntu-20.04-20230717
IMAGE: khronosgroup/docker-images:opencl-sdk-intelcpu-ubuntu-20.04.20230717
- CMAKE: system
COMPILER:
C_NAME: gcc
Expand All @@ -104,7 +104,7 @@ jobs:
CONF:
GEN: Unix Makefiles
CONFIG: Release
IMAGE: streamhpc/opencl-sdk-intelcpu:ubuntu-20.04-20230717
IMAGE: khronosgroup/docker-images:opencl-sdk-intelcpu-ubuntu-20.04.20230717
- CMAKE: system
COMPILER:
C_NAME: gcc
Expand All @@ -115,7 +115,7 @@ jobs:
CONF:
GEN: Unix Makefiles
CONFIG: Debug
IMAGE: streamhpc/opencl-sdk-intelcpu:ubuntu-22.04-20230717
IMAGE: khronosgroup/docker-images:opencl-sdk-intelcpu-ubuntu-22.04.20230717
- CMAKE: system
COMPILER:
C_NAME: gcc
Expand All @@ -126,7 +126,7 @@ jobs:
CONF:
GEN: Unix Makefiles
CONFIG: Release
IMAGE: streamhpc/opencl-sdk-intelcpu:ubuntu-22.04-20230717
IMAGE: khronosgroup/docker-images:opencl-sdk-intelcpu-ubuntu-22.04.20230717
container: ${{matrix.IMAGE}}
env:
CMAKE_EXE: /opt/Kitware/CMake/${{matrix.CMAKE}}/bin/cmake
Expand Down Expand Up @@ -295,7 +295,7 @@ jobs:
- name: Cache Ninja install
if: matrix.GEN == 'Ninja Multi-Config'
id: ninja-install
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
C:\Tools\Ninja
Expand Down Expand Up @@ -332,7 +332,7 @@ jobs:
run: |
$VER = switch ('${{matrix.VER}}') { `
'v142' {'14.2'} `
'v143' {'14.3'} }
'v143' {'14.4'} }
Import-Module "${env:VS_ROOT}\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
Enter-VsDevShell -VsInstallPath ${env:VS_ROOT} -SkipAutomaticLocation -DevCmdArguments "-host_arch=x64 -arch=${{matrix.BIN}} -vcvars_ver=${VER}"
& cmake `
Expand Down Expand Up @@ -366,7 +366,7 @@ jobs:
run: |
$VER = switch ('${{matrix.VER}}') { `
'v142' {'14.2'} `
'v143' {'14.3'} }
'v143' {'14.4'} }
Import-Module "${env:VS_ROOT}\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
Enter-VsDevShell -VsInstallPath ${env:VS_ROOT} -SkipAutomaticLocation -DevCmdArguments "-host_arch=x64 -arch=${{matrix.BIN}} -vcvars_ver=${VER}"
foreach ($Config in 'Release','Debug') {
Expand Down Expand Up @@ -432,7 +432,7 @@ jobs:
run: |
$VER = switch ('${{matrix.VER}}') { `
'v142' {'14.2'} `
'v143' {'14.3'} }
'v143' {'14.4'} }
Import-Module "${env:VS_ROOT}\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
Enter-VsDevShell -VsInstallPath ${env:VS_ROOT} -SkipAutomaticLocation -DevCmdArguments "-host_arch=x64 -arch=${{matrix.BIN}} -vcvars_ver=${VER}"
& cmake `
Expand Down Expand Up @@ -496,7 +496,7 @@ jobs:
run: |
$VER = switch ('${{matrix.VER}}') { `
'v142' {'14.2'} `
'v143' {'14.3'} }
'v143' {'14.4'} }
Import-Module "${env:VS_ROOT}\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
Enter-VsDevShell -VsInstallPath ${env:VS_ROOT} -SkipAutomaticLocation -DevCmdArguments "-host_arch=x64 -arch=${{matrix.BIN}} -vcvars_ver=${VER}"
& cmake `
Expand Down Expand Up @@ -533,8 +533,9 @@ jobs:
CXX: /usr/bin/clang++
- CC: gcc-11
CXX: g++-11
- CC: gcc-13
CXX: g++-13
# Disabled due to problems with the __API_AVAILABLE macro
# - CC: gcc-13
# CXX: g++-13
GEN:
- Xcode
- Ninja Multi-Config
Expand Down

0 comments on commit f6f5aa5

Please sign in to comment.