From 283143c90b593998dc4f2bb4407849649b4bb4ca Mon Sep 17 00:00:00 2001 From: Beatriz Navidad Vilches Date: Wed, 19 Jun 2024 09:25:46 +0000 Subject: [PATCH 1/4] Fixed MSVC compiler toolset version --- .github/workflows/presubmit.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index bcb31e23..18c65fa4 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -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 ` @@ -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') { @@ -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 ` @@ -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 ` From 8a24aa31271334e13dff25bc599f60fd29df1227 Mon Sep 17 00:00:00 2001 From: Beatriz Navidad Vilches Date: Tue, 25 Jun 2024 16:58:13 +0000 Subject: [PATCH 2/4] Disabled macos/gcc-13,g++-13 due to a problem with __API_AVAILABLE --- .github/workflows/presubmit.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index 18c65fa4..d4923ce4 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -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 From 6793d72998374a8ab5988290f60c4b64425a6e92 Mon Sep 17 00:00:00 2001 From: Beatriz Navidad Vilches Date: Tue, 25 Jun 2024 16:45:42 +0000 Subject: [PATCH 3/4] Updated docker images --- .github/workflows/presubmit.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index d4923ce4..668f728a 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -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: @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 From cd23d358498055fd76a6d3b4917c55dd5e0c06ab Mon Sep 17 00:00:00 2001 From: Beatriz Navidad Vilches Date: Tue, 25 Jun 2024 17:09:50 +0000 Subject: [PATCH 4/4] Updated actions to use Node.js 20 --- .github/workflows/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index 668f728a..b6700f8e 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -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