diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..fcde0c288 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,8 @@ +version: 2 +updates: + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly + labels: + - no changelog diff --git a/.github/workflows/emacs-lint.yml b/.github/workflows/emacs-lint.yml index 0f337cad9..5a24c9687 100644 --- a/.github/workflows/emacs-lint.yml +++ b/.github/workflows/emacs-lint.yml @@ -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' diff --git a/.github/workflows/fuzzy-ci.yml b/.github/workflows/fuzzy-ci.yml index cffc02a32..08be7fb02 100644 --- a/.github/workflows/fuzzy-ci.yml +++ b/.github/workflows/fuzzy-ci.yml @@ -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 @@ -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/ @@ -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 @@ -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 }} @@ -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 @@ -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 }} @@ -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 @@ -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 }} @@ -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 }} @@ -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/ @@ -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/ @@ -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/ diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e1c81f68f..825f18c80 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 02d9769f7..1821f53b3 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -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 diff --git a/.github/workflows/ocaml-lsp-compat.yml b/.github/workflows/ocaml-lsp-compat.yml index 6c0e05a8a..b7a4ccd14 100644 --- a/.github/workflows/ocaml-lsp-compat.yml +++ b/.github/workflows/ocaml-lsp-compat.yml @@ -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