mirror of
https://github.com/ProgramSnail/Lama.git
synced 2025-12-06 06:48:48 +00:00
Merge remote-tracking branch 'origin/1.10' into 1.10 after CI fix
This commit is contained in:
commit
11d496405b
4 changed files with 26 additions and 25 deletions
36
.github/workflows/blank.yml
vendored
36
.github/workflows/blank.yml
vendored
|
|
@ -1,12 +1,10 @@
|
||||||
name: Build
|
name: Main workflow
|
||||||
|
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
push:
|
push:
|
||||||
paths-ignore:
|
|
||||||
- 'README.md'
|
permissions: read-all
|
||||||
branches:
|
|
||||||
- '1.10'
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|
@ -14,27 +12,29 @@ jobs:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os:
|
os:
|
||||||
#- macos-latest
|
# - macos-latest
|
||||||
- ubuntu-20.04
|
- ubuntu-latest
|
||||||
#- windows-latest
|
# - windows-latest
|
||||||
ocaml-version:
|
ocaml-compiler:
|
||||||
#- 4.11.0
|
# - "4.11.1"
|
||||||
- 4.10.1
|
# - 4.10.x
|
||||||
#- 4.09.1
|
# - 4.11.x
|
||||||
#- 4.08.1
|
- 4.13.1
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout tree
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v3
|
||||||
- name: Use OCaml ${{ matrix.ocaml-version }}
|
|
||||||
uses: avsm/setup-ocaml@v1
|
- name: Set-up OCaml ${{ matrix.ocaml-compiler }}
|
||||||
|
uses: ocaml/setup-ocaml@v2
|
||||||
with:
|
with:
|
||||||
ocaml-version: ${{ matrix.ocaml-version }}
|
ocaml-compiler: ${{ matrix.ocaml-compiler }}
|
||||||
|
|
||||||
- run: opam pin add Lama.dev . --no-action
|
- run: opam pin add Lama.dev . --no-action
|
||||||
- run: opam depext Lama.dev --yes --with-test
|
- run: opam depext Lama.dev --yes --with-test
|
||||||
- run: opam install . --deps-only --with-test
|
- run: opam install . --deps-only --with-test
|
||||||
|
- run: eval $(opam env)
|
||||||
- run: opam exec -- make #dune build
|
- run: opam exec -- make #dune build
|
||||||
- run: opam exec -- make regression # dune runtest
|
- run: opam exec -- make regression # dune runtest
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ bug-reports: "https://github.com/JetBrains-Research/Lama/issues"
|
||||||
depends: [
|
depends: [
|
||||||
"ocaml" { >= "4.07.1" }
|
"ocaml" { >= "4.07.1" }
|
||||||
"ocamlfind" { build }
|
"ocamlfind" { build }
|
||||||
"camlp5" { >= "8.00"}
|
"camlp5" { >= "8.00.05"}
|
||||||
"ostap" { >= "0.5"}
|
"ostap" { >= "0.5"}
|
||||||
"GT" { >= "0.5.0" }
|
"GT" { >= "0.5.0" }
|
||||||
]
|
]
|
||||||
|
|
|
||||||
11
runtime/gc.c
11
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);
|
fprintf(stderr, "ERROR: get_type_header_ptr: unknown object header, cur_id=%d", cur_id);
|
||||||
raise(SIGINT); // only for debug purposes
|
raise(SIGINT); // only for debug purposes
|
||||||
#else
|
#else
|
||||||
fprintf(stderr,
|
fprintf(
|
||||||
"ERROR: get_type_header_ptr: unknown object header, ptr is %p, "
|
stderr,
|
||||||
"heap size is %d\n",
|
"ERROR: get_type_header_ptr: unknown object header, ptr is %p, tag %i, heap size is %d\n",
|
||||||
ptr,
|
ptr,
|
||||||
heap.size);
|
TAG(*header),
|
||||||
|
heap.size);
|
||||||
#endif
|
#endif
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue