From 17a6703c1d4d2a59d4c0dcb78328f29cfd057add Mon Sep 17 00:00:00 2001
From: Erik Martin-Dorel <erik.martin-dorel@irit.fr>
Date: Sat, 25 Sep 2021 16:24:11 +0200
Subject: [PATCH] fix(.ci-macosx.sh): Avoid { set -e; c1 && c2; } bug & Improve
 script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Make it uniform / job(.github/workflows/static-builds.yml : static-bin-macos)

* Add commands to print OS version details

* Don't hardcode `4.12.1` anymore

* Add `opam … -v` flag to ease debugging

* See also https://github.com/coq-community/docker-coq-action#pitfall-do-not-use--use-semicolons
---
 .ci-macosx.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.ci-macosx.sh b/.ci-macosx.sh
index ef6120e84..2f6a534c8 100644
--- a/.ci-macosx.sh
+++ b/.ci-macosx.sh
@@ -2,15 +2,20 @@
 
 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.1
-eval $(opam env)
+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