From de0d114c26ec87fbfaf34f77a4cdc7c005930cfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Blanqui?= Date: Tue, 29 Apr 2025 12:23:34 +0200 Subject: [PATCH 1/4] test dream versions --- .github/workflows/main.yml | 71 +++++++------------------------------- lambdapi.opam | 1 - 2 files changed, 12 insertions(+), 60 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8056b1419..86ec39715 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,73 +10,26 @@ jobs: strategy: fail-fast: false matrix: - ocaml-version: [5.3.0, 5.2.1, 5.1.1, 5.0.0, 4.14.2, 4.13.1, 4.12.1, 4.11.2, 4.10.2, 4.09.1] + ocaml-version: [4.12.1, 4.11.2, 4.10.2, 4.09.1] #5.3.0, 5.2.1, 5.1.1, 5.0.0, 4.14.2, 4.13.1 + dream-pure: [1.0.0~alpha1 1.0.0~alpha2] + dream-httpaf-version: [1.0.0~alpha1 1.0.0~alpha2 1.0.0~alpha3 1.0.0~alpha4] + dream-version: [1.0.0~alpha1 1.0.0~alpha2 1.0.0~alpha3 1.0.0~alpha4 1.0.0~alpha5 1.0.0~alpha6 1.0.0~alpha7 1.0.0~alpha8] runs-on: ubuntu-latest steps: - - name: checking out lambdapi repo ... + - name: check out lambdapi ... uses: actions/checkout@v4 - # - name: recovering cached opam files ... - # uses: actions/cache@v4 - # with: - # path: ~/.opam - # key: ${{ runner.os }}-ocaml-${{ matrix.ocaml-version }} - - name: setting up opam ... + - name: set up opam ... uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: ${{ matrix.ocaml-version }} - - name: installing dependencies ... + - name: install dream ... + run: | + opam install dream.${{ matrix.dream-version }} dream-pure.${{ matrix.dream-pure-version }} dream-httpaf.${{ matrix.dream-httpaf-version }} + - name: install lambdapi dependencies ... run: | - opam update - opam upgrade opam pin add -n -k path lambdapi . opam install --deps-only -d -t lambdapi - - name: running tests ... + - name: compile lambdapi ... run: | - make sanity_check eval $(opam env) - #why3 config detect - make tests - vscode: - strategy: - fail-fast: false - runs-on: ubuntu-latest - steps: - - name: checking out lambdapi repo ... - uses: actions/checkout@v4 - - name: Use Node.js - uses: actions/setup-node@v4 - with: - node-version: latest - - name: generate-vscode-extension - run: | - npm install -g @types/vscode - npm install -g @vscode/vsce - make build-vscode-extension - make publish-vscode-extension - env: - PAT: ${{ secrets.VSCODE_PAT }} - - name: upload vscode extension - uses: actions/upload-artifact@v4 - with: - name: assets-for-download - path: editors/vscode/extensionFolder - # lint-fmt: - # runs-on: ubuntu-latest - # steps: - # - name: Checkout tree - # uses: actions/checkout@v4 - # - name: Set-up OCaml - # uses: ocaml/setup-ocaml@v3 - # with: - # ocaml-compiler: 5 - # - uses: ocaml/setup-ocaml/lint-fmt@v3 - # lint-opam: - # runs-on: ubuntu-latest - # steps: - # - name: Checkout tree - # uses: actions/checkout@v4 - # - name: Set-up OCaml - # uses: ocaml/setup-ocaml@v3 - # with: - # ocaml-compiler: 5 - # - uses: ocaml/setup-ocaml/lint-opam@v3 + dune build diff --git a/lambdapi.opam b/lambdapi.opam index 27b1404cd..31a8d04b6 100644 --- a/lambdapi.opam +++ b/lambdapi.opam @@ -36,7 +36,6 @@ depends: [ "stdlib-shims" {>= "0.1.0"} "odoc" {with-doc} "lwt_ppx" {>= "1.0.0"} - "dream" {>= "1.0.0~alpha3"} ] build: [ ["dune" "subst"] {dev} From 642a2b269a9af26c2a9055249fc2fa2d07aea312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Blanqui?= Date: Tue, 29 Apr 2025 12:27:36 +0200 Subject: [PATCH 2/4] wip --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 86ec39715..5ba594ace 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: fail-fast: false matrix: ocaml-version: [4.12.1, 4.11.2, 4.10.2, 4.09.1] #5.3.0, 5.2.1, 5.1.1, 5.0.0, 4.14.2, 4.13.1 - dream-pure: [1.0.0~alpha1 1.0.0~alpha2] + dream-pure-version: [1.0.0~alpha1 1.0.0~alpha2] dream-httpaf-version: [1.0.0~alpha1 1.0.0~alpha2 1.0.0~alpha3 1.0.0~alpha4] dream-version: [1.0.0~alpha1 1.0.0~alpha2 1.0.0~alpha3 1.0.0~alpha4 1.0.0~alpha5 1.0.0~alpha6 1.0.0~alpha7 1.0.0~alpha8] runs-on: ubuntu-latest @@ -24,7 +24,7 @@ jobs: ocaml-compiler: ${{ matrix.ocaml-version }} - name: install dream ... run: | - opam install dream.${{ matrix.dream-version }} dream-pure.${{ matrix.dream-pure-version }} dream-httpaf.${{ matrix.dream-httpaf-version }} + opam install dream-pure.${{ matrix.dream-pure-version }} dream-httpaf.${{ matrix.dream-httpaf-version }} dream.${{ matrix.dream-version }} - name: install lambdapi dependencies ... run: | opam pin add -n -k path lambdapi . From 1f88b92a613d4e81ee39790f242c2c69cd081cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Blanqui?= Date: Tue, 29 Apr 2025 12:28:43 +0200 Subject: [PATCH 3/4] wip --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5ba594ace..06979fe61 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,9 +11,9 @@ jobs: fail-fast: false matrix: ocaml-version: [4.12.1, 4.11.2, 4.10.2, 4.09.1] #5.3.0, 5.2.1, 5.1.1, 5.0.0, 4.14.2, 4.13.1 - dream-pure-version: [1.0.0~alpha1 1.0.0~alpha2] - dream-httpaf-version: [1.0.0~alpha1 1.0.0~alpha2 1.0.0~alpha3 1.0.0~alpha4] - dream-version: [1.0.0~alpha1 1.0.0~alpha2 1.0.0~alpha3 1.0.0~alpha4 1.0.0~alpha5 1.0.0~alpha6 1.0.0~alpha7 1.0.0~alpha8] + dream-pure-version: [1.0.0~alpha1, 1.0.0~alpha2] + dream-httpaf-version: [1.0.0~alpha1, 1.0.0~alpha2, 1.0.0~alpha3, 1.0.0~alpha4] + dream-version: [1.0.0~alpha1, 1.0.0~alpha2, 1.0.0~alpha3, 1.0.0~alpha4, 1.0.0~alpha5, 1.0.0~alpha6, 1.0.0~alpha7, 1.0.0~alpha8] runs-on: ubuntu-latest steps: - name: check out lambdapi ... From 1f3def4e48015c7b0834684dcfd5f5f3ff88a231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Blanqui?= Date: Fri, 6 Jun 2025 13:17:23 +0200 Subject: [PATCH 4/4] test ocaml 5.3.0 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 06979fe61..a6c31d243 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - ocaml-version: [4.12.1, 4.11.2, 4.10.2, 4.09.1] #5.3.0, 5.2.1, 5.1.1, 5.0.0, 4.14.2, 4.13.1 + ocaml-version: [5.3.0] #5.2.1, 5.1.1, 5.0.0, 4.14.2, 4.13.1, 4.12.1, 4.11.2, 4.10.2, 4.09.1 dream-pure-version: [1.0.0~alpha1, 1.0.0~alpha2] dream-httpaf-version: [1.0.0~alpha1, 1.0.0~alpha2, 1.0.0~alpha3, 1.0.0~alpha4] dream-version: [1.0.0~alpha1, 1.0.0~alpha2, 1.0.0~alpha3, 1.0.0~alpha4, 1.0.0~alpha5, 1.0.0~alpha6, 1.0.0~alpha7, 1.0.0~alpha8]