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

Fix CI #525

Merged
merged 1 commit into from
Sep 21, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/build_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build_make.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down