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.

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

Update ocaml/setup-ocaml to v3 #1791

Merged
merged 1 commit into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: weekly
labels:
- no changelog
4 changes: 2 additions & 2 deletions .github/workflows/emacs-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
EMACS_PACKAGE_LINT_IGNORE: ${{ matrix.package_lint_ignore }}
EMACS_BYTECOMP_WARN_IGNORE: ${{ matrix.bytecomp_warn_ignore }}
steps:
- uses: purcell/setup-emacs@master
- uses: purcell/setup-emacs@v6.0
with:
version: ${{ matrix.emacs_version }}

- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Run tests
run: 'cd emacs && ./check.sh'
26 changes: 13 additions & 13 deletions .github/workflows/fuzzy-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
echo "version=$v" | tee -a $GITHUB_OUTPUT
- name: Install OCaml
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@v3
with:
ocaml-compiler: ${{ steps.compiler.outputs.version }}
dune-cache: true
Expand All @@ -105,7 +105,7 @@ jobs:
opam exec -- dune install -p merlin-lib,dot-merlin-reader,merlin
- name: Pull irmin and its deps from cache if possible
uses: actions/cache@v3
uses: actions/cache@v4
id: irmin-cache
with:
path: irmin/
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
working-directory: irmin

- name: Pull merl-an from cache if possible
uses: actions/cache@v3
uses: actions/cache@v4
id: merl-an-cache
with:
path: /usr/local/bin/merl-an
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
run: echo "name=$${{ matrix.commit }}_artifact_name" >> $GITHUB_OUTPUT

- name: Upload data
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ steps.artifact_name.outputs.name }}
path: ${{ env.data_dir }}
Expand All @@ -217,7 +217,7 @@ jobs:
- name: Upload diff tool
if: ${{ matrix.commit == 'merge_branch' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: diff_tool
path: create_diff
Expand All @@ -234,13 +234,13 @@ jobs:
diff_dir: diff
steps:
- name: Download base branch data
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.BASE_BRANCH_ARTIFACT_NAME }}
path: ${{ env.base_data_dir }}

- name: Download merge branch data
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.MERGE_BRANCH_ARTIFACT_NAME }}
path: ${{ env.merge_data_dir }}
Expand All @@ -249,7 +249,7 @@ jobs:
run: mkdir -p "$diff_dir"

- name: Download diff tool
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: diff_tool

Expand Down Expand Up @@ -293,7 +293,7 @@ jobs:
| ./create_diff "--input-separator--" "--diff-cmd-separator--" "$diff_dir/$DISTILLED_DIFF_FILE"
- name: Upload diff(s)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.DIFF_ARTIFACT_NAME }}
path: ${{ env.diff_dir }}
Expand All @@ -312,7 +312,7 @@ jobs:

- name: Download current diff(s)
if: ${{ env.current_diff_exists == 'true' }}
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.DIFF_ARTIFACT_NAME }}

Expand Down Expand Up @@ -370,7 +370,7 @@ jobs:
- name: Upload instruction to delete label
if: ${{ env.earlier_diff_was_approved == 'true' && steps.approved_diff.outputs.hash != steps.current_diff.outputs.hash }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: forwarded_instructions
path: forward/
Expand Down Expand Up @@ -453,7 +453,7 @@ jobs:
- name: Upload instruction to delete label
if: ${{ steps.diff_metadata.outputs.exists == 'false' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: forwarded_instructions
path: forward/
Expand Down Expand Up @@ -498,7 +498,7 @@ jobs:
'{instruction: $instruction, endpoint: $endpoint, artifacts_url: $artifacts_url, hash: $hash}' > ./forward/instruction.json
- name: Upload instruction to comment on PR
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: forwarded_instructions
path: forward/
3 changes: 1 addition & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,12 @@ jobs:
uses: actions/checkout@v4

- name: Set-up OCaml ${{ matrix.ocaml-compiler }}
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@v3
with:
ocaml-compiler: ${{ matrix.ocaml-compiler }}

- name: Install dependencies
run: |
opam depext conf-jq --yes # opam depext bug
opam pin menhirLib 20201216 --no-action
opam install --yes ppx_string ppx_compare
opam install . --deps-only --with-test --yes
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
- name: nix
uses: cachix/install-nix-action@v21
uses: cachix/install-nix-action@v27
with:
nix_path: nixpkgs=channel:nixos-unstable
- run: nix develop -c dune build @check @runtest -p merlin-lib,dot-merlin-reader,merlin
5 changes: 2 additions & 3 deletions .github/workflows/ocaml-lsp-compat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,16 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up OCaml ${{ matrix.ocaml-compiler }}
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@v3
with:
# Version of the OCaml compiler to initialise
ocaml-compiler: ${{ matrix.ocaml-compiler }}

- name: Check that Merlin and OCaml-LSP are co-installable
run: |
opam depext conf-jq # opam depext bug
opam --cli=2.1 pin --with-version=dev --no-action https://github.com/voodoos/ocaml-lsp.git#5.2-preview
opam --cli=2.1 pin --with-version=5.0-502 --no-action .
opam install ocaml-lsp-server --with-test --ignore-constraints-on=ocamlformat
Expand Down
Loading