Skip to content

Commit 95f7875

Browse files
authored
Merge pull request #29036 from MisterDA/windows-ci
Clarify the Windows CI build/host/targets environments
2 parents 043b6ea + 10b2170 commit 95f7875

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

.github/workflows/windows.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@ env:
1010
MSYS: winsymlinks:native
1111
jobs:
1212
build:
13+
name: "target/host: x86_64-w64-mingw32, build: ${{ matrix.build_env }}"
1314
strategy:
1415
fail-fast: false
1516
matrix:
16-
os:
17-
- windows-latest
18-
windows_env:
17+
build_env:
1918
- cygwin
2019
- msys2
21-
runs-on: ${{ matrix.os }}
20+
runs-on: windows-latest
2221
steps:
2322
- name: Checkout tree
2423
uses: actions/checkout@v6
@@ -37,10 +36,10 @@ jobs:
3736
path: |
3837
D:\opam\bin
3938
D:\opamroot
40-
key: ${{ runner.os }}-${{ matrix.windows_env }}-opam-${{ hashFiles('install.ps1') }}
39+
key: ${{ runner.os }}-${{ matrix.build_env }}-opam-${{ hashFiles('install.ps1') }}
4140

42-
- name: Add MSys2 to PATH and install prerequisites
43-
if: matrix.windows_env == 'msys2'
41+
- name: Add MSYS2 to PATH and install prerequisites
42+
if: matrix.build_env == 'msys2'
4443
run: |
4544
"C:\msys64" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
4645
C:\msys64\usr\bin\pacman.exe --noconfirm -Syuu # Core update (in case any core packages are outdated)
@@ -58,7 +57,7 @@ jobs:
5857
5958
- name: Init opam
6059
if: steps.cache-opam.outputs.cache-hit != 'true'
61-
run: opam init --yes --no-setup ${{ matrix.windows_env == 'msys2' && '--cygwin-local-install' || '' }} .
60+
run: opam init --yes --no-setup ${{ matrix.build_env == 'msys2' && '--cygwin-local-install' || '' }} .
6261

6362
- name: Restrict testing to available compilers
6463
if: steps.cache-opam.outputs.cache-hit != 'true'
@@ -74,10 +73,11 @@ jobs:
7473
D:\opamroot
7574
key: ${{ steps.cache-opam.outputs.cache-primary-key }}
7675

77-
- name: Print version information
76+
- name: Print version and configuration information
7877
run: |
7978
opam --version
8079
opam exec -- ocaml -version
80+
opam exec -- ocamlopt -config
8181
opam var
8282
8383
- name: Get changed files

0 commit comments

Comments
 (0)