-
Notifications
You must be signed in to change notification settings - Fork 188
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
Remove *.opam.template #1753
Remove *.opam.template #1753
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
name: build | ||
|
||
on: | ||
pull_request: | ||
push: | ||
branches: | ||
- master | ||
pull_request: | ||
schedule: | ||
# Prime the caches every Monday | ||
- cron: 0 1 * * MON | ||
|
@@ -23,62 +23,29 @@ jobs: | |
- "4.11" | ||
- "4.12" | ||
- "4.13" | ||
- "4.14" | ||
- "5.0" | ||
- "5.1" | ||
skip-test: | ||
- true | ||
skip-doc: | ||
- true | ||
skip-effects: | ||
- true | ||
- "5.2" | ||
include: | ||
- os: ubuntu-latest | ||
ocaml-compiler: "4.14" | ||
skip-effects: true | ||
skip-test: false | ||
skip-doc: true | ||
- os: ubuntu-latest | ||
ocaml-compiler: "ocaml-variants.4.14.2+options,ocaml-option-32bit" | ||
skip-effects: true | ||
skip-test: false | ||
skip-doc: true | ||
- os: macos-latest | ||
ocaml-compiler: "4.14" | ||
skip-effects: true | ||
skip-test: false | ||
skip-doc: true | ||
- os: windows-latest | ||
ocaml-compiler: "4.14" | ||
skip-effects: true | ||
skip-test: false | ||
skip-doc: true | ||
- os: ubuntu-latest | ||
ocaml-compiler: "5.2" | ||
skip-effects: false | ||
skip-test: false | ||
skip-doc: false | ||
# Note this OCaml compiler is bytecode only | ||
- os: ubuntu-latest | ||
ocaml-compiler: "ocaml-variants.5.2.0+options,ocaml-option-32bit" | ||
skip-effects: true # disabled for the same reason than `skip-test` | ||
skip-test: true # the `time_now.0.17` package is pulled and doesn't work in 32 bits :( | ||
skip-doc: true | ||
- os: macos-latest | ||
ocaml-compiler: "5.2" | ||
skip-effects: true | ||
skip-test: false | ||
skip-doc: true | ||
- os: windows-latest | ||
ocaml-compiler: "5.2" | ||
skip-effects: false | ||
skip-test: false | ||
skip-doc: true | ||
- os: ubuntu-latest | ||
ocaml-compiler: "ocaml-variants.4.14.2+options,ocaml-option-32bit" | ||
- os: ubuntu-latest | ||
ocaml-compiler: "ocaml-variants.5.2.1+options,ocaml-option-32bit" # Note this OCaml compiler is bytecode only | ||
|
||
runs-on: ${{ matrix.os }} | ||
|
||
steps: | ||
- name: Set git to use LF | ||
if: matrix.ocaml-compiler < 5.2 | ||
if: matrix.os == 'windows-latest' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't understand this change. |
||
run: | | ||
git config --global core.autocrlf false | ||
git config --global core.eol lf | ||
|
@@ -88,7 +55,7 @@ jobs: | |
# getting much better, but no luck yet, c.f: | ||
# https://github.com/ocaml/opam-repository/pull/26626 | ||
- name: Install apt 32-bit dependencies | ||
if: contains( matrix.ocaml-compiler, 'ocaml-option-32bit') | ||
if: contains(matrix.ocaml-compiler, 'ocaml-option-32bit') | ||
run: | | ||
sudo apt-get install aptitude | ||
sudo dpkg --add-architecture i386 | ||
|
@@ -109,41 +76,33 @@ jobs: | |
uses: ocaml/setup-ocaml@v3 | ||
with: | ||
ocaml-compiler: ${{ matrix.ocaml-compiler }} | ||
dune-cache: true | ||
opam-pin: false | ||
|
||
- run: opam install conf-pkg-config | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We need this, this is a temporary fix for dra27/mingw-w64-shims#1 |
||
if: runner.os == 'Windows' | ||
|
||
- run: opam install . --best-effort | ||
if: ${{ matrix.skip-test }} | ||
|
||
- run: opam install . --with-test | ||
if: ${{ !matrix.skip-test }} | ||
if: matrix.ocaml-compiler < 4.14 | ||
|
||
- run: opam exec -- make all | ||
if: ${{ !matrix.skip-test }} | ||
- run: opam install . --deps-only --with-test --with-doc | ||
if: matrix.ocaml-compiler >= 4.14 | ||
|
||
- run: opam exec -- make tests | ||
if: ${{ !matrix.skip-test }} | ||
- run: opam exec -- dune build @all @runtest | ||
if: matrix.ocaml-compiler >= 4.14 && matrix.ocaml-compiler < 5.0 | ||
|
||
- run: opam exec -- dune build @all @runtest --profile using-effects | ||
if: ${{ !matrix.skip-effects }} | ||
if: matrix.ocaml-compiler >= 5.0 | ||
|
||
- run: opam exec -- git diff --exit-code | ||
if: ${{ !matrix.skip-test }} | ||
if: matrix.ocaml-compiler >= 4.14 | ||
|
||
- name: build doc | ||
if: ${{ !matrix.skip-doc && github.event_name == 'push' && github.ref_name == 'master'}} | ||
- name: Build doc | ||
if: matrix.os == 'ubuntu-latest' && matrix.ocaml-compiler == '5.2' && github.event_name == 'push' && github.ref_name == 'master' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would prefer to only bump version once when it come to change the version we generate the doc with. |
||
run: | | ||
opam install odoc lwt_log cohttp-lwt-unix yojson ocp-indent graphics higlo | ||
opam exec -- make doc | ||
|
||
- name: synchronize doc | ||
if: ${{ !matrix.skip-doc && github.event_name == 'push' && github.ref_name == 'master' }} | ||
- name: Synchronize doc | ||
if: matrix.os == 'ubuntu-latest' && matrix.ocaml-compiler == '5.2' && github.event_name == 'push' && github.ref_name == 'master' | ||
uses: JamesIves/github-pages-deploy-action@v4 | ||
with: | ||
branch: wikidoc | ||
folder: doc-dev | ||
clean: true | ||
target-folder: doc/dev/ | ||
target-folder: doc/dev/ |
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
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 find the previous version much easier to understand.
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 PR kind of inline the logic previously encoded by skip-* parameters. We know have to go over all step understand what's done for what version. I think this is going in the wrong direction.