fixup! [CI] Draft a homebrew-based macCI.

Author: hageboeck

.github/workflows/root-ci-config/build_root.py

@@ -30,6 +30,7 @@
     die,
     github_log_group,
     is_macos,
+    print_options_diff,
     subprocess_with_capture,
     subprocess_with_log,
     upload_file,
@@ -69,13 +70,17 @@ def main():
     # Load CMake options from .github/workflows/root-ci-config/buildconfig/[platform].txt
     this_script_dir = os.path.dirname(os.path.abspath(__file__))
 
-    override_dict = dict(arg.split("=") for arg in args.overrides)
-    options_dict = {
-        **build_utils.load_config(f"{this_script_dir}/buildconfig/global.txt"),
-        # file below overwrites values from above
-        **build_utils.load_config(f"{this_script_dir}/buildconfig/{args.platform}.txt"),
-        **override_dict,
-    }
+    options_dict = build_utils.load_config(f"{this_script_dir}/buildconfig/global.txt")
+    temp = dict(options_dict)
+    options_dict.update(build_utils.load_config(f"{this_script_dir}/buildconfig/{args.platform}.txt"))
+    print("Build options (platform-specific):")
+    print_options_diff(options_dict, temp)
+
+    if args.overrides is not None:
+        temp = dict(options_dict)
+        options_dict.update((arg.split("=") for arg in args.overrides))
+        print("Build options (CI override):")
+        print_options_diff(options_dict, temp)
 
     options = build_utils.cmake_options_from_dict(options_dict)
 

.github/workflows/root-ci-config/build_utils.py

@@ -108,6 +108,16 @@ def print_warning(*values, **kwargs):
 def print_error(*values, **kwargs):
     print_fancy("Fatal error: ", *values, sgr=31, **kwargs)
 
+def print_options_diff(new, old):
+    """Print difference between build option dicts"""
+
+    for key in new:
+        try:
+            if new[key] != old[key]:
+                print(f"\t{key}:\t{old[key]} --> {new[key]}")
+        except:
+            print(f"\t{key}:\tNone --> {new[key]}")
+
 
 def subprocess_with_log(command: str) -> int:
     """Runs <command> in shell and appends <command> to log"""

.github/workflows/root-ci.yml

@@ -152,9 +152,12 @@ jobs:
         run: |
           $(brew --prefix python)/bin/python3 -m venv ROOT_CI
           source ROOT_CI/bin/activate
-          echo PATH=$PATH >> $GITHUB_PATH
+          echo $(pwd)/ROOT_CI/bin >> $GITHUB_PATH
           pip install --upgrade pip
-          cat ${{ github.workspace }}/src/requirements.txt | while read PACKAGE; do pip install -U "$PACKAGE"; done || true
+          cat ${{ github.workspace }}/src/requirements.txt | while read PACKAGE; do
+            if [ -n "${PACKAGE%%#*}" ]; then
+              pip install -U "${PACKAGE%%#*}";
+          fi; done || true
           pip install openstacksdk # TODO: Remove?
 
       - name: Apply option overrides from matrix for this job for non-release builds
@@ -180,7 +183,7 @@ jobs:
           GITHUB_PR_ORIGIN: ${{ github.event.pull_request.head.repo.clone_url }}
           OVERRIDES: ${{ join( matrix.overrides, ' ') }}
         run: |
-          source ROOT_CI/bin/activate
+          if [ -f ROOT_CI/bin/activate ]; then source ROOT_CI/bin/activate; fi
           src/.github/workflows/root-ci-config/build_root.py  \
                     --buildtype       RelWithDebInfo          \
                     --incremental     $INCREMENTAL            \
@@ -190,7 +193,7 @@ jobs:
                     --head_ref        refs/pull/${{ github.event.pull_request.number }}/head:${{ github.event.pull_request.head.ref }}  \
                     --head_sha        ${{ github.event.pull_request.head.sha }}         \
                     --repository      ${{ github.server_url }}/${{ github.repository }} \
-                    --platform        ${{ matrix.platform }}                            \
+                    --platform        ${{ matrix.platform == 'experimental-brew-ci' && 'mac15' || matrix.platform }}
                     --overrides       $GLOBAL_OVERRIDES $OVERRIDES
 
       - name: Workflow dispatch