Update GitHub Actions workflows #1782
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,8 +9,6 @@ on: | |
| jobs: | ||
| build: | ||
| env: | ||
| WASM_OF_OCAML: true | ||
|
|
||
| strategy: | ||
|
|
@@ -19,45 +17,44 @@ jobs: | |
| os: | ||
| - ubuntu-latest | ||
| ocaml-compiler: | ||
| - "4.14" | ||
| - "5.0" | ||
| - "5.1" | ||
| - "5.2" | ||
| - ocaml-compiler.5.3.0~beta2 | ||
| separate_compilation: | ||
| - true | ||
| include: | ||
| - os: macos-latest | ||
| ocaml-compiler: "5.2" | ||
| separate_compilation: true | ||
| - os: ubuntu-latest | ||
| ocaml-compiler: "4.14" | ||
| separate_compilation: false | ||
|
|
||
| runs-on: ${{ matrix.os }} | ||
|
|
||
| steps: | ||
| - name: Checkout tree | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Checkout Jane Street opam repository | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| repository: janestreet/opam-repository | ||
| ref: feaf8f831051fd5f316963b28efd728cf0b0eca1 | ||
| path: janestreet/opam-repository | ||
|
|
||
| - name: Set-up Node.js | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: latest | ||
|
|
||
| - name: Set-up OCaml ${{ matrix.ocaml-compiler }} | ||
| uses: ocaml/setup-ocaml@v3 | ||
| with: | ||
| ocaml-compiler: ${{ matrix.ocaml-compiler }} | ||
|
|
||
| - name: Set-up Binaryen | ||
| uses: Aandreba/[email protected] | ||
| with: | ||
|
|
@@ -67,84 +64,68 @@ jobs: | |
| # It's faster to use a cached version | ||
| run: opam install --fake binaryen-bin | ||
|
|
||
| - name: Checkout Jane Street packages | ||
| run: | | ||
| opam install opam-format ocamlfind dune graphics cmdliner sexplib0.v0.16.0 | ||
| opam exec -- ocaml tools/ci_setup.ml | ||
|
|
||
| - name: Install dependencies | ||
| run: opam install . --deps-only --with-test | ||
|
|
||
| - name: Run tests | ||
| if: ${{ matrix.separate_compilation }} | ||
| run: opam exec -- dune build @runtest-wasm | ||
|
|
||
| - name: Run tests with CPS effects | ||
| if: ${{ matrix.ocaml-compiler >= '5.' && matrix.separate_compilation }} | ||
| run: opam exec -- dune build @runtest-wasm --profile with-effects | ||
|
|
||
| - name: Run Base tests | ||
| if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }} | ||
| working-directory: ./janestreet/lib/base | ||
| run: opam exec -- dune runtest | ||
|
|
||
| - name: Run Base bigstring tests | ||
| if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }} | ||
| working-directory: ./janestreet/lib/base_bigstring | ||
| run: opam exec -- dune runtest | ||
|
|
||
| - name: Run Core tests | ||
| if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }} | ||
| working-directory: ./janestreet/lib/core | ||
| run: opam exec -- dune runtest | ||
|
|
||
| - name: Run Bignum tests | ||
| if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }} | ||
| working-directory: ./janestreet/lib/bignum | ||
| run: opam exec -- dune runtest | ||
|
|
||
| - name: Run Bin_prot tests | ||
| if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }} | ||
| working-directory: ./janestreet/lib/bin_prot | ||
| run: opam exec -- dune runtest | ||
|
|
||
| - name: Run String_dict tests | ||
| if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }} | ||
| working-directory: ./janestreet/lib/string_dict | ||
| run: opam exec -- dune runtest | ||
|
|
||
| - name: Run Zarith tests | ||
| if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }} | ||
| working-directory: ./janestreet/lib/zarith_stubs_js | ||
| run: opam exec -- dune runtest | ||
|
|
||
| - name: Run Virtual_dom tests | ||
| if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }} | ||
| working-directory: ./janestreet/lib/virtual_dom | ||
| run: opam exec -- dune runtest | ||
|
|
||
| - name: Run Bonsai tests | ||
| if: ${{ matrix.ocaml-compiler < '5.' && matrix.separate_compilation }} | ||
| working-directory: ./janestreet/lib/bonsai | ||
| run: opam exec -- dune runtest | ||
|
|
||
| - name: Run Bonsai tests (release profile) | ||
| if: ${{ ! matrix.separate_compilation }} | ||
| working-directory: ./janestreet/lib/bonsai | ||
| run: opam exec -- dune runtest --profile release | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,12 +83,15 @@ jobs: | |
|
|
||
| steps: | ||
| - name: Set git to use LF | ||
| if: ${{ matrix.os == 'windows-latest' && matrix.ocaml-compiler < 5.2 }} | ||
| run: | | ||
| git config --global core.autocrlf false | ||
| git config --global core.eol lf | ||
| git config --global core.ignorecase false | ||
|
|
||
| - name: Checkout tree | ||
| uses: actions/checkout@v4 | ||
|
|
||
| # EJGA: Note that I tried to fix this upstream as depext is | ||
| # getting much better, but no luck yet, c.f: | ||
| # https://github.com/ocaml/opam-repository/pull/26626 | ||
|
|
@@ -102,23 +105,15 @@ jobs: | |
| # try to install them anyways, so we save an apt-roundtrip. | ||
| sudo aptitude -o Acquire::Retries=30 install gcc-multilib g++-multilib pkg-config libgmp-dev libgmp-dev:i386 libx11-dev:i386 -y | ||
|
|
||
| - name: Set-up Node.js | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: latest | ||
|
|
||
| - name: Set-up OCaml ${{ matrix.ocaml-compiler }} | ||
| uses: ocaml/setup-ocaml@v3 | ||
| with: | ||
| ocaml-compiler: ${{ matrix.ocaml-compiler }} | ||
|
There was a problem hiding this comment. I think this is the second time you try to remove that line. It was here on purpose to work-around an opam packaging issue. Are you sure it is no longer needed There was a problem hiding this comment. Yes, it's no longer needed. There was a problem hiding this comment. To be more clear, There was a problem hiding this comment. I don't remember this being related to zarith There was a problem hiding this comment. At least for now, There was a problem hiding this comment. I though the issue was with mingw-64-shims and its optional dep on conf-pkg-config. Here is an extract of a private discussion with @dra27
@dra27 do you remember this issue, can you confirm it was fixed ? There was a problem hiding this comment. If I remember correctly, it was fixed in There was a problem hiding this comment. No, I have failing logs involving mingw-w64-shims.0.2.0 There was a problem hiding this comment. |
||
|
|
||
| - name: Set-up Binaryen | ||
| uses: Aandreba/[email protected] | ||
|
|
@@ -132,11 +127,7 @@ jobs: | |
| - run: opam install . --best-effort | ||
| if: ${{ matrix.skip-test }} | ||
|
|
||
| - run: opam install . --deps-only --with-test | ||
| # Install the test dependencies | ||
| if: ${{ !matrix.skip-test }} | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will need to come back once we start testing windows
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the upcoming PR, I'm going to make changes to separate the jobs for testing and installation testing so that we can run all tests on all platforms.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand what you mean by that.