Merge pull request #5405 from dra27/brew-python

Assume availability of Python 3 on GHA runners

.github/scripts/main/archives-cache.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -xue
+#!/bin/bash
+
+set -xue
 
 . .github/scripts/main/preamble.sh
 

.github/scripts/main/create-ocaml-cache.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -xue
+#!/bin/bash
+
+set -xue
 
 OCAML_BRANCH="$1"
 PREFIX="$2"

.github/scripts/main/hygiene.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -xue
+#!/bin/bash
+
+set -xue
 
 . .github/scripts/common/hygiene-preamble.sh
 

.github/scripts/main/legacy-cache.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -xue
+#!/bin/bash
+
+set -xue
 
 . .github/scripts/main/preamble.sh
 

.github/scripts/main/legacy.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -xue
+#!/bin/bash
+
+set -xue
 
 . .github/scripts/main/preamble.sh
 

.github/scripts/main/main.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -xue
+#!/bin/bash
+
+set -xue
 
 . .github/scripts/main/preamble.sh
 

.github/scripts/main/ocaml-cache.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -xue
+#!/bin/bash
+
+set -xue
 
 . .github/scripts/main/preamble.sh
 

.github/scripts/main/opam-bs-cache.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -xue
+#!/bin/bash
+
+set -xue
 
 . .github/scripts/main/preamble.sh
 

.github/scripts/main/opam-rt.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -xue
+#!/bin/bash
+
+set -xue
 
 . .github/scripts/main/preamble.sh
 

.github/scripts/main/reftests.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -xue
+#!/bin/bash
+
+set -xue
 
 . .github/scripts/main/preamble.sh
 

.github/scripts/main/solvers.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -xue
+#!/bin/bash
+
+set -xue
 
 . .github/scripts/main/preamble.sh
 
@@ -12,6 +14,11 @@ echo $OPAMROOT
 case "$SOLVER" in
   z3)
     PKGS=$SOLVER
+    if [[ $RUNNER_OS = 'macOS' ]]; then
+      # brew may require extra flags to override the system-installed python,
+      # so we assume the presence of python3 on the macOS runners.
+      opam option --global 'depext-bypass=["python@3"]'
+    fi
     ;;
   0install)
     PKGS="$SOLVER opam-0install-cudf"

.github/scripts/main/test.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -xue
+#!/bin/bash
+
+set -xue
 
 . .github/scripts/main/preamble.sh
 

.github/scripts/main/upgrade.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -xue
+#!/bin/bash
+
+set -xue
 
 . .github/scripts/main/preamble.sh
 

.github/scripts/scripts/hygiene.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -xue
+#!/bin/bash
+
+set -xue
 
 . .github/scripts/common/hygiene-preamble.sh
 

.github/workflows/ci.ml

@@ -251,8 +251,8 @@ let install_sys_packages packages ~descr ?cond platforms =
       in
       let commands =
         match platforms with
-        | [Linux] -> [linux_command ^ " || true"]
-        | [MacOS] -> [macos_command ^ " || true"]
+        | [Linux] -> [linux_command]
+        | [MacOS] -> [macos_command]
         | _ ->
             let commands =
               if List.mem MacOS platforms then
@@ -502,8 +502,8 @@ let main oc : unit =
     ("OPAM12CACHE", "~/.cache/opam1.2/cache");
     (* These should be identical to the values in appveyor.yml *)
     ("OPAM_REPO", "https://github.com/ocaml/opam-repository.git");
-    ("OPAM_TEST_REPO_SHA", "59a65e144ad843d97ddd3e3e600c2a33c02527fd");
-    ("OPAM_REPO_SHA", "59a65e144ad843d97ddd3e3e600c2a33c02527fd");
+    ("OPAM_TEST_REPO_SHA", "849d953adddc9c44486de3307e9c757aba85b225");
+    ("OPAM_REPO_SHA", "849d953adddc9c44486de3307e9c757aba85b225");
     ("SOLVER", "");
     (* Cygwin configuration *)
     ("CYGWIN_MIRROR", "http://mirrors.kernel.org/sourceware/cygwin/");

.github/workflows/main.yml

@@ -103,7 +103,7 @@ jobs:
         check-only: true
     - name: Install system's opam package
       if: steps.legacy.outputs.cache-hit != 'true'
-      run: sudo apt install opam || true
+      run: sudo apt install opam
     - name: Create ocaml-secondary-compiler cache
       if: steps.legacy.outputs.cache-hit != 'true'
       run: bash -exu .github/scripts/main/legacy-cache.sh
@@ -285,7 +285,7 @@ jobs:
       fail-fast: true
     steps:
     - name: Install system's opam package
-      run: sudo apt install opam || true
+      run: sudo apt install opam
     - name: Checkout tree
       uses: actions/checkout@v3
     - name: ocaml-secondary-compiler Cache
@@ -620,7 +620,7 @@ jobs:
     needs: Analyse
     steps:
     - name: Install system's dune and ocaml packages
-      run: sudo apt install dune ocaml || true
+      run: sudo apt install dune ocaml
     - name: Checkout tree
       uses: actions/checkout@v3
     - name: src_ext/archives and opam-repository Cache

master_changes.md

@@ -250,6 +250,7 @@ users)
   * Bid a fond farewell to AppVeyor, with thanks for 5100+ CI builds [#5134 @dra27]
   * Remove Cygwin32 from testing, as it's been retired upstream [#5365 @dra27]
   * Ensure all the compilers can be built on Ubuntu 22.04 [#5391 @dra27]
+  * Workaround brew problem on macOS GHA runner testing Z3 [#5405 @dra27]
 
 ## Release scripts
   * Make the release script setup-less using QEMU, Docker and Rosetta 2 [#4947 @kit-ty-kate]