Revert "test: macos-11, instead of macos-latest = macos-12"

This reverts commit 831c90c.
JeffersonLab · Jan 10, 2024 · 80e4844 · 80e4844
1 parent 831c90c
commit 80e4844
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
           cmake --build build -j2
           cmake --install build
       - run: brew install tree
-        if: ${{ inputs.runner == 'macos-11' }}
+        if: ${{ inputs.runner == 'macos-latest' }}
       - run: tree hipo
       - name: tar
         run: tar czvf hipo{.tar.gz,}
@@ -62,7 +62,7 @@ jobs:
           cmake --build build -j2
           cmake --install build
       - run: brew install tree
-        if: ${{ inputs.runner == 'macos-11' }}
+        if: ${{ inputs.runner == 'macos-latest' }}
       - run: tree fmt
       - name: tar
         run: tar czvf fmt{.tar.gz,}
@@ -113,7 +113,7 @@ jobs:
       - name: untar build
         run: ls *.tar.gz | xargs -I{} tar xzvf {}
       - run: brew install tree
-        if: ${{ inputs.runner == 'macos-11' }}
+        if: ${{ inputs.runner == 'macos-latest' }}
       - run: tree
       - name: configure
         run: ./configure.py --hipo hipo --fmt fmt --examples --no-documentation ${{ matrix.configure_opts }}
@@ -129,7 +129,7 @@ jobs:
           libraries=$(find iguana -type f -name "*.so")
           for obj in $binaries $libraries; do
             echo "[+++] READ $obj"
-            if [ ${{ inputs.runner }} = "macos-11" ]; then
+            if [ ${{ inputs.runner }} = "macos-latest" ]; then
               otool -l $obj
             else
               readelf -d $obj
@@ -214,7 +214,7 @@ jobs:
           ls *.tar.gz | xargs -I{} tar xzvf {}
           rm -v *.tar.gz
       - run: brew install tree
-        if: ${{ inputs.runner == 'macos-11' }}
+        if: ${{ inputs.runner == 'macos-latest' }}
       - name: tree artifacts
         run: tree
       - name: source environment
@@ -225,8 +225,10 @@ jobs:
           echo PYTHONPATH=$PYTHONPATH               >> $GITHUB_ENV
           echo DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH >> $GITHUB_ENV
       - name: test 00
+        if: ${{ inputs.runner != 'macos-latest' || matrix.binding != 'python' }} # FIXME: https://github.com/JeffersonLab/iguana/issues/75
         run: iguana/bin/iguana-example-00-basic${{ matrix.extension }} test_data.hipo ${{ env.num_events }}
       - name: test 01
+        if: ${{ inputs.runner != 'macos-latest' || matrix.binding != 'python' }} # FIXME: https://github.com/JeffersonLab/iguana/issues/75
         run: iguana/bin/iguana-example-01-bank-rows${{ matrix.extension }} test_data.hipo ${{ env.num_events }}
 
   test_consumer_builds:
@@ -269,7 +271,7 @@ jobs:
           .github/test-consumer-build.sh ${{ matrix.tool }}
       - name: readelf/otool executable
         run: |
-          if [ ${{ inputs.runner }} = "macos-11" ]; then
+          if [ ${{ inputs.runner }} = "macos-latest" ]; then
             otool -l install-consumer/bin/iguana-example-00-basic
           else
             readelf -d install-consumer/bin/iguana-example-00-basic

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -14,4 +14,4 @@ jobs:
   macOS:
     uses: ./.github/workflows/ci.yml
     with:
-      runner: macos-11
+      runner: macos-latest