From de7eb04ba750e044ff4263ebfade3d9a603fec9a Mon Sep 17 00:00:00 2001 From: hra687261 Date: Tue, 20 Sep 2022 22:32:20 +0200 Subject: [PATCH] Fix CI: - Replaced `ocaml-version` with `ocaml-compiler` - Switched to `actions/checkout@v3` --- .github/workflows/build_docker.yml | 4 ++-- .github/workflows/build_js.yml | 4 ++-- .github/workflows/build_macos.yml | 4 ++-- .github/workflows/build_make.yml | 14 +++++++------- .github/workflows/build_ubuntu.yml | 12 ++++++------ .github/workflows/build_windows.yml | 4 ++-- .github/workflows/documentation.yml | 6 +++--- .github/workflows/linter.yml | 8 ++++---- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml index 8f61497f7..2d4a407a2 100644 --- a/.github/workflows/build_docker.yml +++ b/.github/workflows/build_docker.yml @@ -21,7 +21,7 @@ jobs: # Checkout the code of the current branch - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Switch to ocaml user - run: su ocaml @@ -32,7 +32,7 @@ jobs: # This line is needed to allow the working directory to be used even # the ocaml user do not have rights on it. - - run: git config --global --add safe.directory /__w/alt-ergo/alt-ergo + - run: CURRENTDIR=$(basename $(pwd)); git config --global --add safe.directory /__w/$CURRENTDIR/$CURRENTDIR # Create a switch with the system compiler (no compilation needed). # And then, install external (no need for depext with opam 2.1) and libs deps. diff --git a/.github/workflows/build_js.yml b/.github/workflows/build_js.yml index 80e4a97f9..1602ec5fb 100644 --- a/.github/workflows/build_js.yml +++ b/.github/workflows/build_js.yml @@ -24,7 +24,7 @@ jobs: steps: # Checkout the code of the current branch - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Update apt-get database - name: Update apt-get database @@ -46,7 +46,7 @@ jobs: - name: Use OCaml ${{ env.OCAML_DEFAULT_VERSION }} uses: avsm/setup-ocaml@v2 with: - ocaml-version: ${{ env.OCAML_DEFAULT_VERSION }} + ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }} # Pin the packages, this is needed for opam depext # remove this step when opam 2.1 will be used diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index 8cdf7c573..9e50e8958 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -26,7 +26,7 @@ jobs: steps: # Checkout the code of the current branch - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Retrieve the opam cache with unique key # A new cache is created/used if the `.opam` files changes or @@ -44,7 +44,7 @@ jobs: - name: Use OCaml ${{ env.OCAML_DEFAULT_VERSION }} uses: avsm/setup-ocaml@v2 with: - ocaml-version: ${{ env.OCAML_DEFAULT_VERSION }} + ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }} # Pin the packages, this is needed for opam depext # remove this step when opam 2.1 will be used diff --git a/.github/workflows/build_make.yml b/.github/workflows/build_make.yml index a5345b5e6..0e1e7cb6b 100644 --- a/.github/workflows/build_make.yml +++ b/.github/workflows/build_make.yml @@ -22,7 +22,7 @@ jobs: steps: # Checkout the code of the current branch - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Update apt-get database - name: Update apt-get database @@ -44,7 +44,7 @@ jobs: - name: Use OCaml ${{ env.OCAML_DEFAULT_VERSION }} uses: avsm/setup-ocaml@v2 with: - ocaml-version: ${{ env.OCAML_DEFAULT_VERSION }} + ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }} # Pin the packages, this is needed for opam depext # remove this step when opam 2.1 will be used @@ -94,7 +94,7 @@ jobs: steps: # Checkout the code of the current branch - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Update apt-get database - name: Update apt-get database @@ -116,7 +116,7 @@ jobs: - name: Use OCaml ${{ env.OCAML_DEFAULT_VERSION }} uses: avsm/setup-ocaml@v2 with: - ocaml-version: ${{ env.OCAML_DEFAULT_VERSION }} + ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }} # Pin the packages, this is needed for opam depext # remove this step when opam 2.1 will be used @@ -168,7 +168,7 @@ jobs: steps: # Checkout the code of the current branch - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Update apt-get database - name: Update apt-get database @@ -188,14 +188,14 @@ jobs: - name: Use OCaml ${{ env.OCAML_DEFAULT_VERSION }} uses: avsm/setup-ocaml@v2 with: - ocaml-version: ${{ env.OCAML_DEFAULT_VERSION }} + ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }} # 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: avsm/setup-ocaml@v2 with: - ocaml-version: ${{ env.OCAML_DEFAULT_VERSION }} + ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }} # Pin the packages, this is needed for opam depext # remove this step when opam 2.1 will be used diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml index 603ee6154..30beb5a76 100644 --- a/.github/workflows/build_ubuntu.yml +++ b/.github/workflows/build_ubuntu.yml @@ -29,7 +29,7 @@ jobs: steps: # Checkout the code of the current branch - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Update apt-get database - name: Update apt-get database @@ -51,7 +51,7 @@ jobs: - name: Use OCaml ${{ env.OCAML_DEFAULT_VERSION }} uses: avsm/setup-ocaml@v2 with: - ocaml-version: ${{ env.OCAML_DEFAULT_VERSION }} + ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }} # Pin the packages, this is needed for opam depext # remove this step when opam 2.1 will be used @@ -107,7 +107,7 @@ jobs: strategy: matrix: # Setup ocaml versions to test - ocaml-version: + ocaml-compiler: - 4.05.0 - 4.05.0+flambda - 4.06.1 @@ -126,7 +126,7 @@ jobs: steps: # Checkout the code of the current branch - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Update apt-get database - name: Update apt-get database @@ -141,14 +141,14 @@ jobs: id: cache-opam with: path: ~/.opam - key: v1-${{ runner.os }}-alt-ergo-${{ matrix.ocaml-version }}-${{ hashFiles('*.opam') }} + key: v1-${{ runner.os }}-alt-ergo-${{ matrix.ocaml-compiler }}-${{ hashFiles('*.opam') }} # 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: avsm/setup-ocaml@v2 with: - ocaml-version: ${{ env.OCAML_DEFAULT_VERSION }} + ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }} # Pin the packages, this is needed for opam depext # remove this step when opam 2.1 will be used diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 25efc1050..794a21386 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -24,7 +24,7 @@ jobs: steps: # Checkout the code of the current branch - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Retrieve the opam cache with unique key # A new cache is created/used if the `.opam` files changes or @@ -42,7 +42,7 @@ jobs: - name: Use OCaml ${{ env.OCAML_DEFAULT_VERSION }} uses: avsm/setup-ocaml@v2 with: - ocaml-version: ${{ env.OCAML_DEFAULT_VERSION }} + ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }} # Pin the packages, this is needed for opam depext # remove this step when opam 2.1 will be used diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 74f73f067..69c7e25da 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -32,7 +32,7 @@ jobs: steps: # Checkout the code of the current branch - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Update apt-get database - name: Update apt-get database @@ -54,7 +54,7 @@ jobs: - name: Use OCaml ${{ env.OCAML_DEFAULT_VERSION }} uses: avsm/setup-ocaml@v2 with: - ocaml-version: ${{ env.OCAML_DEFAULT_VERSION }} + ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }} # Pin the packages, this is needed for opam depext # remove this step when opam 2.1 will be used @@ -111,7 +111,7 @@ jobs: steps: # Checkout the code of the current branch - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Build the sphinx documentation # and automatically print any error or warning diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 0d71b10e0..2b30c6af1 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -25,7 +25,7 @@ jobs: steps: # Checkout the code of the current branch - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Retrieve the opam cache with unique key # A new cache is created/used if the `.opam` files changes or @@ -43,7 +43,7 @@ jobs: - name: Use OCaml ${{ env.OCAML_DEFAULT_VERSION }} uses: avsm/setup-ocaml@v2 with: - ocaml-version: ${{ env.OCAML_DEFAULT_VERSION }} + ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }} # Install ocp-indent with the fixed version # Do nothing if ocp-indent is already installed @@ -65,7 +65,7 @@ jobs: steps: # Checkout the code of the current branch - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Retrieve the opam cache with unique key # A new cache is created/used if the `.opam` files changes or @@ -83,7 +83,7 @@ jobs: - name: Use OCaml ${{ env.OCAML_DEFAULT_VERSION }} uses: avsm/setup-ocaml@v2 with: - ocaml-version: ${{ env.OCAML_DEFAULT_VERSION }} + ocaml-compiler: ${{ env.OCAML_DEFAULT_VERSION }} # Install dependencies of the ocpchecker executable # Dune and stdlib-shims is needed to build the executable