Skip to content

Commit

Permalink
Remove prerelease flags (#1167)
Browse files Browse the repository at this point in the history
We do not need to allow prerelease of opam in our workflows as the
version 2.2 have been released. We also bump the version of `setup-ocaml` to `v3`.
  • Loading branch information
Halbaroth authored Jul 17, 2024
1 parent a1f2e60 commit 6f843ce
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 16 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,8 @@ jobs:
persist-credentials: false

- name: Use OCaml ${{ matrix.ocaml-compiler }}
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@v3
with:
allow-prerelease-opam: true
ocaml-compiler: ${{ matrix.ocaml-compiler }}
dune-cache: true

Expand All @@ -69,9 +68,8 @@ jobs:
persist-credentials: false

- name: Use OCaml ${{ env.OCAML_DEFAULT_VERSION }}
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@v3
with:
allow-prerelease-opam: true
ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }}
dune-cache: true

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/build_js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ jobs:
# Get an OCaml environment with opam installed and the proper ocaml version
# opam will used opam cache environment if retrieved
- name: Use OCaml ${{ env.OCAML_DEFAULT_VERSION }}
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@v3
with:
allow-prerelease-opam: true
ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }}

# Install dependencies
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/build_static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ jobs:
with:
persist-credentials: false

- uses: ocaml/setup-ocaml@v2
- uses: ocaml/setup-ocaml@v3
with:
allow-prerelease-opam: true
ocaml-compiler: 4.14.1
dune-cache: true

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,8 @@ jobs:
# Get an OCaml environment with opam installed and the proper ocaml version
# opam will used opam cache environment if retrieved
- name: Use OCaml ${{ env.OCAML_DEFAULT_VERSION }}
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@v3
with:
allow-prerelease-opam: true
ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }}
dune-cache: true

Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ jobs:
# Get an OCaml environment with opam installed and the proper ocaml version
# opam will used opam cache environment if retrieved
- name: Use OCaml ${{ env.OCAML_DEFAULT_VERSION }}
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@v3
with:
allow-prerelease-opam: true
ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }}
dune-cache: true

Expand Down Expand Up @@ -61,9 +60,8 @@ jobs:
# Get an OCaml environment with opam installed and the proper ocaml version
# opam will used opam cache environment if retrieved
- name: Use OCaml ${{ env.OCAML_DEFAULT_VERSION }}
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@v3
with:
allow-prerelease-opam: true
ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }}
dune-cache: true

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ jobs:
fetch-tags: true

- name: Use OCaml ${{ env.OCAML_DEFAULT_VERSION }}
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@v3
with:
allow-prerelease-opam: true
ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }}
dune-cache: true

Expand Down

0 comments on commit 6f843ce

Please sign in to comment.