Skip to content

Commit d3b125e

Browse files
committed
Update more instances of issues
1 parent 0043921 commit d3b125e

6 files changed

Lines changed: 18 additions & 6 deletions

File tree

.github/workflows/call-workflows.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ jobs:
173173
thread_safety: ""
174174
build_mode: "Release"
175175
force_java_implementation: "jni"
176+
win_runner: "windows-2022"
177+
win_vs_generator: "Visual Studio 17 2022"
176178

177179
call-jni-latest-java:
178180
name: "JNI Latest Java Testing"

.github/workflows/ctest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ jobs:
903903
# Windows w/ OneAPI
904904
#
905905
name: "Windows Intel CTest"
906-
runs-on: windows-latest
906+
runs-on: windows-2022
907907
needs: [check-secret]
908908
steps:
909909
- name: Install Dependencies (Windows_intel)

.github/workflows/intel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171

7272
Intel_oneapi_windows:
7373
name: "windows-oneapi ${{ inputs.build_mode }}"
74-
runs-on: windows-2025
74+
runs-on: windows-2022
7575
steps:
7676
- name: Get Sources (Windows)
7777
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3

.github/workflows/main-spc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ jobs:
366366

367367
build_v2_0_win:
368368
name: "Intel DBG v2.0.0 default API no deprecated"
369-
runs-on: windows-2025
369+
runs-on: windows-2022
370370
steps:
371371
# SETUP
372372
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it

.github/workflows/main.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,16 @@ on:
3535
required: false
3636
default: "jni"
3737
type: string
38+
win_runner:
39+
description: "Windows runner version to use (windows-2022, windows-latest, etc.)"
40+
required: false
41+
default: "windows-latest"
42+
type: string
43+
win_vs_generator:
44+
description: "CMake generator to use for Visual Studio"
45+
required: false
46+
default: "Visual Studio 18 2026"
47+
type: string
3848

3949
permissions:
4050
contents: read
@@ -71,7 +81,7 @@ jobs:
7181
# No Fortran, parallel, or VFDs that rely on POSIX things
7282
- name: "Windows MSVC"
7383
ostype: windows
74-
os: windows-latest
84+
os: ${{ inputs.win_runner }}
7585
shared: ON
7686
cpp: ON
7787
fortran: OFF
@@ -84,7 +94,7 @@ jobs:
8494
parallel: OFF
8595
mirror_vfd: OFF
8696
direct_vfd: OFF
87-
generator: "-G \"Visual Studio 18 2026\" -A x64"
97+
generator: "-G \"${{ inputs.win_vs_generator }}\" -A x64"
8898
run_tests: true
8999

90100
# Linux (Ubuntu) w/ gcc

.github/workflows/script.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ jobs:
484484
# Windows w/ OneAPI
485485
#
486486
name: "Windows Intel CTest"
487-
runs-on: windows-latest
487+
runs-on: windows-2022
488488
steps:
489489
- name: Get Actions
490490
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3

0 commit comments

Comments
 (0)