Skip to content

fix(CI): Use ocaml 4.12.1 #422

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Sep 26, 2021
Merged

fix(CI): Use ocaml 4.12.1 #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5ece9b
fix: CI
erikmd Sep 25, 2021
6478085
test(GHA): Enable cron build for static-builds.yml
erikmd Sep 25, 2021
17a6703
fix(.ci-macosx.sh): Avoid { set -e; c1 && c2; } bug & Improve script
erikmd Sep 25, 2021
0a30b4f
fix(.ci-macosx.sh): Install openssl
erikmd Sep 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .ci-macosx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,21 @@

set -e

sw_vers
system_profiler SPSoftwareDataType
uname -a

brew update
brew install pkg-config
brew install opam
brew install libev
opam init -y --compiler=4.12.0
eval $(opam env)
brew install openssl
opam init -y -a --bare

opam install -y -j 2 . --deps-only --locked
make && make opaminstall
opam switch create . ocaml-base-compiler --deps-only --locked -y -j 2 # -v
eval $(opam env)
make
make opaminstall

# See src/main/linking_flags.sh
make detect-libs
3 changes: 3 additions & 0 deletions .github/workflows/static-builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ on:
pull_request:
branches:
- '**'
schedule:
# test master every Saturday at 08:00 UTC
- cron: '0 8 * * 6'
jobs:
static-bin-linux:
name: Builds static Linux binaries
Expand Down
2 changes: 1 addition & 1 deletion learn-ocaml-client.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ depends: [
"ezjsonm"
"lwt" {>= "4.0.0"}
"lwt_ssl"
"ocaml" {= "4.12.0"}
"ocaml" {(>= "4.12") & (< "4.13~")}
"ocamlfind" {build}
"ocp-indent-nlfork"
"ocp-ocamlres" {>= "0.4"}
Expand Down
2 changes: 1 addition & 1 deletion learn-ocaml-client.opam.locked
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ depends: [
"menhirSdk" {= "20210419"}
"mmap" {= "1.1.0"}
"num" {= "1.4"}
"ocaml" {= "4.12.0"}
"ocaml" {= "4.12.1"}
"ocaml-compiler-libs" {= "v0.12.3"}
"ocaml-config" {= "2"}
"ocaml-migrate-parsetree" {= "1.8.0"}
Expand Down
2 changes: 1 addition & 1 deletion learn-ocaml.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ depends: [
"magic-mime"
"markup"
"markup-lwt"
"ocaml" {= "4.12.0"}
"ocaml" {(>= "4.12") & (< "4.13~")}
"ocamlfind" {build}
"ocp-indent-nlfork"
"ocp-ocamlres" {= "0.4"}
Expand Down
2 changes: 1 addition & 1 deletion learn-ocaml.opam.locked
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ depends: [
"menhirSdk" {= "20210419"}
"mmap" {= "1.1.0"}
"num" {= "1.4"}
"ocaml" {= "4.12.0"}
"ocaml" {= "4.12.1"}
"ocaml-compiler-libs" {= "v0.12.3"}
"ocaml-config" {= "2"}
"ocaml-migrate-parsetree" {= "1.8.0"}
Expand Down
2 changes: 1 addition & 1 deletion scripts/static-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cd $(dirname "$0")/..
set -o pipefail
git ls-files -z | xargs -0 tar c | \
docker run --rm -i \
ocamlpro/ocaml:4.12-2021-07-25 \
ocamlpro/ocaml:4.12 \
sh -uexc \
'tar x >&2 &&
sudo apk add openssl-libs-static bash >&2 &&
Expand Down