From 2a42e1e1767e14ccc0efdfcad86cce84a28d7822 Mon Sep 17 00:00:00 2001 From: danyaberezun Date: Wed, 31 May 2023 11:33:04 +0200 Subject: [PATCH 1/4] add tag print in error in get_type_header_ptr --- runtime/gc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/runtime/gc.c b/runtime/gc.c index 74bf81831..89c20cd9a 100644 --- a/runtime/gc.c +++ b/runtime/gc.c @@ -481,11 +481,12 @@ lama_type get_type_header_ptr (void *ptr) { fprintf(stderr, "ERROR: get_type_header_ptr: unknown object header, cur_id=%d", cur_id); raise(SIGINT); // only for debug purposes #else - fprintf(stderr, - "ERROR: get_type_header_ptr: unknown object header, ptr is %p, " - "heap size is %d\n", - ptr, - heap.size); + fprintf( + stderr, + "ERROR: get_type_header_ptr: unknown object header, ptr is %p, tag %i, heap size is %d\n", + ptr, + TAG(*header), + heap.size); #endif exit(1); } From 3a5a85a87e90799efeb3d5f0c6c5105d6b4ab211 Mon Sep 17 00:00:00 2001 From: danyaberezun Date: Wed, 31 May 2023 11:39:09 +0200 Subject: [PATCH 2/4] fixci --- Lama.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lama.opam b/Lama.opam index ff20e2093..de96fb88d 100644 --- a/Lama.opam +++ b/Lama.opam @@ -10,7 +10,7 @@ bug-reports: "https://github.com/JetBrains-Research/Lama/issues" depends: [ "ocaml" { >= "4.07.1" } "ocamlfind" { build } - "camlp5" { >= "8.00"} + "camlp5" { >= "8.00.05"} "ostap" { >= "0.5"} "GT" { >= "0.5.0" } ] From c81788363be2bfd50f4b84f65aab4e0b78c6acbe Mon Sep 17 00:00:00 2001 From: danyaberezun Date: Wed, 31 May 2023 12:48:10 +0300 Subject: [PATCH 3/4] Update version.ml --- src/version.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.ml b/src/version.ml index 43eb219b1..ecd4cf514 100644 --- a/src/version.ml +++ b/src/version.ml @@ -1 +1 @@ -let version = "Version 1.10, 80b391aff, Tue Oct 25 02:57:51 2022 +0300" +let version = "Version 1.10, 1bafe839d, Sun Mar 12 05:30:58 2023 +0300" From 89881d848e33f75515fe03f4ba093c5102f54712 Mon Sep 17 00:00:00 2001 From: danyaberezun Date: Wed, 31 May 2023 15:59:42 +0200 Subject: [PATCH 4/4] fix ci --- .github/workflows/blank.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml index f46f30ebf..867362335 100644 --- a/.github/workflows/blank.yml +++ b/.github/workflows/blank.yml @@ -1,12 +1,10 @@ -name: Build +name: Main workflow on: pull_request: push: - paths-ignore: - - 'README.md' - branches: - - '1.10' + +permissions: read-all jobs: build: @@ -14,27 +12,29 @@ jobs: fail-fast: false matrix: os: - #- macos-latest - - ubuntu-20.04 - #- windows-latest - ocaml-version: - #- 4.11.0 - - 4.10.1 - #- 4.09.1 - #- 4.08.1 +# - macos-latest + - ubuntu-latest +# - windows-latest + ocaml-compiler: +# - "4.11.1" + # - 4.10.x + # - 4.11.x + - 4.13.1 runs-on: ${{ matrix.os }} steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Use OCaml ${{ matrix.ocaml-version }} - uses: avsm/setup-ocaml@v1 + - name: Checkout tree + uses: actions/checkout@v3 + + - name: Set-up OCaml ${{ matrix.ocaml-compiler }} + uses: ocaml/setup-ocaml@v2 with: - ocaml-version: ${{ matrix.ocaml-version }} + ocaml-compiler: ${{ matrix.ocaml-compiler }} - run: opam pin add Lama.dev . --no-action - run: opam depext Lama.dev --yes --with-test - run: opam install . --deps-only --with-test + - run: eval $(opam env) - run: opam exec -- make #dune build - run: opam exec -- make regression # dune runtest