Skip to content

Commit

Permalink
Merge pull request #6383 from kit-ty-kate/gha-show-cygwin-info
Browse files Browse the repository at this point in the history
GHA: Show Cygwin version info after loading it from the cache
  • Loading branch information
rjbou authored Feb 12, 2025
2 parents 4aa865a + 6b2f392 commit fa15881
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.ml
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ let main_build_job ~analyse_job ~cygwin_job ?section runner start_version ~oc ~w
++ cache Archives
++ cache OCaml platform "${{ matrix.ocamlv }}" host
++ only_on Windows (unpack_cygwin "${{ matrix.build }}" "${{ matrix.host }}")
++ only_on Windows (run "Cygwin info" ["uname -a"])
++ build_cache OCaml platform "${{ matrix.ocamlv }}" host
++ run "Build" ["bash -exu .github/scripts/main/main.sh " ^ host]
++ not_on Windows (run "Test (basic)" ["bash -exu .github/scripts/main/test.sh"])
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ jobs:
- name: Unpack Cygwin
shell: cmd
run: .github\scripts\cygwin.cmd ${{ matrix.build }} D:\Cache\cygwin ${{ matrix.host }}
- name: Cygwin info
run: uname -a
- name: Unpack OCaml ${{ matrix.ocamlv }}
run: bash -exu .github/scripts/main/ocaml-cache.sh ${{ runner.os }} ${{ matrix.ocamlv }} ${{ matrix.host }}
- name: Build
Expand Down
1 change: 1 addition & 0 deletions master_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ users)
* Add OCaml 5.3 to the build matrix [#6192 @kit-ty-kate]
* Add OCaml 5.3/MSVC to the build matrix [#6192 @kit-ty-kate]
* Add a test making sure `opam init` works in the absence of `OPAMROOT` [#5663 @kit-ty-kate]
* Show Cygwin version info after loading it from the cache [#6383 @kit-ty-kate]

## Doc
* Update the command to install opam to point to the new simplified url on opam.ocaml.org [#6226 @kit-ty-kate]
Expand Down

0 comments on commit fa15881

Please sign in to comment.