-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Summary: To upgrade to OCaml 5.2 we first need to override the dependency info for stdcompat (it forbids 5.2 without reason according to, e.g., ocamllibs/stdcompat#34 (comment)) This diff simply checks in the package sources under `dependencies/stdcompat` to simplify review. Subsequent diffs will use the package via pinning. Reviewed By: jvillard Differential Revision: D66008056 Privacy Context Container: L1208441 fbshipit-source-id: f400f6e03b378b3d23ebf239525cb406770b7003
- Loading branch information
1 parent
b8298f1
commit 8ec5907
Showing
1,341 changed files
with
105,597 additions
and
0 deletions.
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 |
---|---|---|
@@ -0,0 +1,5 @@ | ||
ci/*.sh -text | ||
.github/scripts/*.sh text eol=lf | ||
/configure text eol=lf | ||
/Makefile.in text eol=lf | ||
/install-sh text eol=lf |
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 |
---|---|---|
@@ -0,0 +1,4 @@ | ||
set -e | ||
opam install --yes dune | ||
dune build --ignore-promoted-rules | ||
dune runtest |
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 |
---|---|---|
@@ -0,0 +1,6 @@ | ||
set -e | ||
ocaml_compiler="$1" | ||
builder="$2" | ||
opam switch "$ocaml_compiler" | ||
eval $(opam env) | ||
sh -exc ".github/scripts/build-\"$builder\".sh" |
4 changes: 4 additions & 0 deletions
4
dependencies/stdcompat/.github/scripts/build-make-no-magic.sh
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 |
---|---|---|
@@ -0,0 +1,4 @@ | ||
set -e | ||
./configure --disable-magic | ||
make | ||
make 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
set -e | ||
./configure | ||
make | ||
make 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,128 @@ | ||
name: ci | ||
on: [push] | ||
jobs: | ||
build-ubuntu: | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
builder: | ||
- dune | ||
- make | ||
- make-no-magic | ||
ocaml-compiler: | ||
- 4.02.x | ||
- 4.03.x | ||
- 4.04.x | ||
- 4.05.x | ||
- 4.06.x | ||
- 4.07.x | ||
- 4.08.x | ||
- 4.09.x | ||
- 4.10.x | ||
- 4.11.x | ||
- 4.12.x | ||
- 4.13.x | ||
- 4.14.x | ||
- 5.0.0 | ||
- 5.1.1 | ||
- 5.2.0 | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
- name: Setup OCaml | ||
uses: ocaml/setup-ocaml@v2 | ||
with: | ||
ocaml-compiler: ${{ matrix.ocaml-compiler }} | ||
- name: Make stdcompat | ||
run: | | ||
opam exec -- sh -xc ".github/scripts/build-${{ matrix.builder }}.sh" | ||
build-macos-and-windows: | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
os: | ||
- macos-latest | ||
- windows-latest | ||
builder: | ||
- dune | ||
- make | ||
- make-no-magic | ||
ocaml-compiler: | ||
- 4.02.x | ||
- 4.14.x | ||
- 5.0.0 | ||
- 5.1.1 | ||
- 5.2.0 | ||
- ocaml-variants.4.14.0+mingw64c | ||
exclude: | ||
- os: macos-latest | ||
ocaml-compiler: ocaml-variants.4.14.0+mingw64c | ||
runs-on: ${{ matrix.os }} | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
- name: Setup OCaml | ||
uses: ocaml/setup-ocaml@v2 | ||
with: | ||
ocaml-compiler: ${{ matrix.ocaml-compiler }} | ||
- name: Make stdcompat | ||
run: | | ||
opam exec -- sh -xc ".github/scripts/build-${{ matrix.builder }}.sh" | ||
build-ubuntu-old-ocamls: | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
builder: | ||
- make | ||
- make-no-magic | ||
ocaml-compiler: | ||
- 3.07 | ||
- 3.08.4 | ||
- 3.09.3 | ||
- 3.10.2 | ||
- 3.11.2 | ||
- 3.12.1 | ||
- 4.00.1 | ||
- 4.01.0 | ||
runs-on: ubuntu-latest | ||
container: | ||
image: ghcr.io/thierry-martinez/stdcompat-old-ocamls | ||
credentials: | ||
username: ${{ github.actor }} | ||
password: ${{ secrets.packages_actions_read }} | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
- name: Make stdcompat | ||
run: | | ||
chown -R ci $PWD && \ | ||
su ci -c "sh -xc \".github/scripts/build-in-docker.sh \ | ||
\\\"${{ matrix.ocaml-compiler }}\\\" \ | ||
\\\"${{ matrix.builder }}\\\"\"" | ||
# build-ubuntu-ocaml-5-beta: | ||
# strategy: | ||
# fail-fast: false | ||
# matrix: | ||
# builder: | ||
# - dune | ||
# - make | ||
# - make-no-magic | ||
# runs-on: ubuntu-latest | ||
# container: | ||
# image: ghcr.io/thierry-martinez/stdcompat-ocaml-5-beta | ||
# credentials: | ||
# username: ${{ github.actor }} | ||
# password: ${{ secrets.packages_actions_read }} | ||
# steps: | ||
# - name: Checkout | ||
# uses: actions/checkout@v3 | ||
# - name: Make stdcompat | ||
# run: | | ||
# chown -R ci $PWD && \ | ||
# su ci -c "sh -xc \".github/scripts/build-in-docker.sh \ | ||
# 5.0.0~alpha1 \ | ||
# \\\"${{ matrix.builder }}\\\"\"" |
18 changes: 18 additions & 0 deletions
18
dependencies/stdcompat/.github/workflows/windows.yml.disabled
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 |
---|---|---|
@@ -0,0 +1,18 @@ | ||
name: windows | ||
on: [push] | ||
jobs: | ||
build-windows: | ||
runs-on: windows-latest | ||
steps: | ||
- name: Setup Cygwin and mingw64 | ||
run: | | ||
choco install cygwin | ||
# patch is needed for opam | ||
choco install --source cygwin rsync patch diffutils curl make unzip git m4 perl mingw64-x86_64-gcc-core mingw64-x86_64-gcc-g++ | ||
- name: Setup opam | ||
run: | | ||
$env:PATH = 'C:\tools\cygwin\usr\local\bin;C:\tools\cygwin\bin;' + $env:PATH | ||
curl -o opam64.tar.xz -L https://github.com/fdopen/opam-repository-mingw/releases/download/0.0.0.2/opam64.tar.xz | ||
tar -xf opam64.tar.xz | ||
bash opam64/install.sh | ||
opam init default "https://github.com/fdopen/opam-repository-mingw.git#opam2" -c "ocaml-variants.4.14.0+mingw64c" --disable-sandboxing |
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 |
---|---|---|
@@ -0,0 +1 @@ | ||
Thierry Martinez <[email protected]> |
Oops, something went wrong.