Fix issues with MSVC and OneAPI CI due to VS 18 2026 (#6438)

* Update Visual Studio versions in workflows
* Revert change to Windows ARM workflows
* Pin Intel OneAPI workflows to windows-2025
* Update more instances of issues
This commit is contained in:
jhendersonHDF
2026-06-13 08:14:47 -05:00
committed by GitHub
parent 41ea347fb9
commit 90077ae8da
7 changed files with 32 additions and 7 deletions
+3
View File
@@ -173,6 +173,9 @@ jobs:
thread_safety: ""
build_mode: "Release"
force_java_implementation: "jni"
java_version: 11
win_runner: "windows-2022"
win_vs_generator: "Visual Studio 17 2022"
call-jni-latest-java:
name: "JNI Latest Java Testing"
+1 -1
View File
@@ -903,7 +903,7 @@ jobs:
# Windows w/ OneAPI
#
name: "Windows Intel CTest"
runs-on: windows-latest
runs-on: windows-2022
needs: [check-secret]
steps:
- name: Install Dependencies (Windows_intel)
+7 -1
View File
@@ -71,7 +71,7 @@ jobs:
Intel_oneapi_windows:
name: "windows-oneapi ${{ inputs.build_mode }}"
runs-on: windows-latest
runs-on: windows-2022
steps:
- name: Get Sources (Windows)
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
@@ -86,6 +86,12 @@ jobs:
compiler: intel
version: '2025.2'
- name: Setup Java
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
java-version: 11
distribution: 'temurin'
- name: Configure (Windows)
shell: pwsh
env:
+7 -1
View File
@@ -366,7 +366,7 @@ jobs:
build_v2_0_win:
name: "Intel DBG v2.0.0 default API no deprecated"
runs-on: windows-latest
runs-on: windows-2022
steps:
# SETUP
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -386,6 +386,12 @@ jobs:
compiler: intel
version: '2025.0'
- name: Setup Java
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
java-version: 11
distribution: 'temurin'
- name: Configure (Windows)
shell: pwsh
env:
+1 -1
View File
@@ -71,7 +71,7 @@ jobs:
mirror_vfd: OFF
direct_vfd: OFF
ros3_vfd: OFF
generator: "-G \"Visual Studio 17 2022\" -A x64"
generator: "-G \"Visual Studio 18 2026\" -A x64"
run_tests: true
- name: "Ubuntu Static gcc"
+12 -2
View File
@@ -35,6 +35,16 @@ on:
required: false
default: "jni"
type: string
win_runner:
description: "Windows runner version to use (windows-2022, windows-latest, etc.)"
required: false
default: "windows-latest"
type: string
win_vs_generator:
description: "CMake generator to use for Visual Studio"
required: false
default: "Visual Studio 18 2026"
type: string
permissions:
contents: read
@@ -71,7 +81,7 @@ jobs:
# No Fortran, parallel, or VFDs that rely on POSIX things
- name: "Windows MSVC"
ostype: windows
os: windows-latest
os: ${{ inputs.win_runner }}
shared: ON
cpp: ON
fortran: OFF
@@ -84,7 +94,7 @@ jobs:
parallel: OFF
mirror_vfd: OFF
direct_vfd: OFF
generator: "-G \"Visual Studio 17 2022\" -A x64"
generator: "-G \"${{ inputs.win_vs_generator }}\" -A x64"
run_tests: true
# Linux (Ubuntu) w/ gcc
+1 -1
View File
@@ -484,7 +484,7 @@ jobs:
# Windows w/ OneAPI
#
name: "Windows Intel CTest"
runs-on: windows-latest
runs-on: windows-2022
steps:
- name: Get Actions
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3