Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GHA: Use upstream fix for OCaml 5.1 libzstd problem #975

Merged
merged 1 commit into from
Oct 11, 2023
Merged

GHA: Use upstream fix for OCaml 5.1 libzstd problem #975

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ jobs:
fail-fast: false
matrix:
job:
- { os: macos-12 , ocaml-version: 5.1.0 }
- { os: macos-12 , ocaml-version: "5.1.0+options,ocaml-option-no-compression" }
- { os: macos-12 , ocaml-version: 4.14.1 }
- { os: macos-11 , ocaml-version: 4.14.1 , publish: true , fnsuffix: -macos-x86_64 }
- { os: ubuntu-22.04 , ocaml-version: 5.1.0 }
- { os: ubuntu-22.04 , ocaml-version: "5.1.0+options,ocaml-option-no-compression" }
- { os: ubuntu-22.04 , ocaml-version: 4.14.1 }
- { os: ubuntu-20.04 , ocaml-version: 4.14.1 }
- { os: windows-2022 , ocaml-version: 4.14.0+mingw64c , publish: true , fnsuffix: -windows-x86_64 }
Expand Down Expand Up @@ -137,15 +137,6 @@ jobs:
arch: "${{ steps.vars.outputs.MSVC_ARCH }}"
if: contains(matrix.job.ocaml-version, '+msvc')

# OCaml 5.1.0 has a bug which causes all built executables to depend on
# libzstd, whether they use it or not. Since it's not possible to pass
# arguments to configure with setup-ocaml/opam then a workaround is to
# just remove the GHA pre-installed libzstd.
- name: "macOS: Work around OCaml 5.1 bug"
if: ${{ runner.os == 'macOS' && contains(matrix.job.ocaml-version, '5.1.') }}
shell: bash
run: brew uninstall --ignore-dependencies zstd

- name: Use OCaml ${{ matrix.job.ocaml-version }}
uses: ocaml/setup-ocaml@v2
with:
Expand Down