WIP: combine mac and linux steps

Author: jordan-evens

.github/workflows/cmake-test-on.yml

@@ -72,29 +72,15 @@ jobs:
 
     - run: ./firestarr . 2024-06-03 58.81228184403946 -122.9117103995713 01:00 --ffmc 89.9 --dmc 59.5 --dc 450.9 --apcp_prev 0 -v --wx ./test/input/10N_50651/firestarr_10N_50651_wx.csv --output_date_offsets [1] --tz -5 --raster-root ./test/input/10N_50651/ --perim ./test/input/10N_50651/10N_50651.tif
 
-    - name: Locate binary (macos)
-      if: ${{ matrix.variant == 'Release' && inputs.os == 'macos' }}
-      id: locate-macos
+    - name: Locate binary (non-windows)
+      if: ${{ matrix.variant == 'Release' && inputs.os != 'windows' }}
+      id: locate
       run: |
         # Find the built executable
-        BINARY=$(find build -type f -name "firestarr" -perm +111 | head -1)
+        BINARY=$(find build -type f -name "firestarr" ${{ case ( inputs.os == 'macos', '-perm +111', '-executable' ) }} | head -1)
         if [ -z "$BINARY" ]; then
           echo "ERROR: Could not find firestarr binary"
-          find build -type f -perm +111
-          exit 1
-        fi
-        echo "binary=$BINARY" >> $GITHUB_OUTPUT
-        echo "Found binary at: $BINARY"
-
-    - name: Locate binary (linux)
-      if: ${{ matrix.variant == 'Release' && inputs.os == 'ubuntu' }}
-      id: locate-linux
-      run: |
-        # Find the built executable
-        BINARY=$(find build -type f -name "firestarr" -executable | head -1)
-        if [ -z "$BINARY" ]; then
-          echo "ERROR: Could not find firestarr binary"
-          find build -type f -executable
+          find build -type f ${{ case ( inputs.os == 'macos', '-perm +111', '-executable' ) }}
           exit 1
         fi
         echo "binary=$BINARY" >> $GITHUB_OUTPUT
@@ -114,23 +100,14 @@ jobs:
         echo "Found binary at: $BINARY"
       shell: pwsh
 
-    - name: Check binary dependencies (macos)
-      if: ${{ matrix.variant == 'Release' && inputs.os == 'macos' }}
-      run: |
-        echo "=== Binary info ==="
-        file ${{ steps.locate-macos.outputs.binary }}
-        echo ""
-        echo "=== Dynamic dependencies ==="
-        otool -L ${{ steps.locate-macos.outputs.binary }} || true
-
-    - name: Check binary dependencies (linux)
-      if: ${{ matrix.variant == 'Release' && inputs.os == 'ubuntu' }}
+    - name: Check binary dependencies (non-windows)
+      if: ${{ matrix.variant == 'Release' && inputs.os != 'windows' }}
       run: |
         echo "=== Binary info ==="
-        file ${{ steps.locate-linux.outputs.binary }}
+        file ${{ steps.locate.outputs.binary }}
         echo ""
         echo "=== Dynamic dependencies ==="
-        ldd ${{ steps.locate-linux.outputs.binary }} || true
+        ${{ case ( inputs.os == 'macos', 'otool -L', 'ldd' ) }} ${{ steps.locate.outputs.binary }} || true
 
     - name: Check binary dependencies (windows)
       if: ${{ matrix.variant == 'Release' && inputs.os == 'windows' }}
@@ -142,35 +119,12 @@ jobs:
         (Get-Item "${{ steps.locate-windows.outputs.binary }}").Length / 1MB | ForEach-Object { "{0:N2} MB" -f $_ }
       shell: pwsh
 
-    - name: Package artifact (macos)
-      if: ${{ matrix.variant == 'Release' && inputs.os == 'macos' }}
-      run: |
-        mkdir -p dist
-        cp README.md LICENSE ORIGIN.md dist/
-        cp ${{ steps.locate-macos.outputs.binary }} dist/firestarr
-
-        # Bundle data files if they exist
-        [ -f fuel.lut ] && cp fuel.lut dist/
-        [ -f settings.ini ] && cp settings.ini dist/
-        [ -f data/fuel.lut ] && cp data/fuel.lut dist/
-        [ -f data/settings.ini ] && cp data/settings.ini dist/
-
-        # Create version info
-        ./firestarr -h | head -n1 > dist/VERSION
-
-        # List contents
-        echo "=== Package contents ==="
-        ls -la dist/
-
-        # Create tarball
-        tar -czvf ${{ env.OUTPUT_BINARY }}.tar.gz -C dist .
-
-    - name: Package artifact (linux)
-      if: ${{ matrix.variant == 'Release' && inputs.os == 'ubuntu' }}
+    - name: Package artifact (non-windows)
+      if: ${{ matrix.variant == 'Release' && inputs.os != 'windows' }}
       run: |
         mkdir -p dist
         cp README.md LICENSE ORIGIN.md dist/
-        cp ${{ steps.locate-linux.outputs.binary }} dist/firestarr
+        cp ${{ steps.locate.outputs.binary }} dist/firestarr
 
         # Bundle data files if they exist
         [ -f fuel.lut ] && cp fuel.lut dist/
@@ -217,16 +171,8 @@ jobs:
         Compress-Archive -Path dist\* -DestinationPath ${{ env.OUTPUT_BINARY }}.zip
       shell: pwsh
 
-    - name: Upload artifact (macos)
-      if: ${{ matrix.variant == 'Release' && inputs.os == 'macos' }}
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ env.OUTPUT_BINARY }}
-        path: ${{ env.OUTPUT_BINARY }}.tar.gz
-        retention-days: 30
-
-    - name: Upload artifact (linux)
-      if: ${{ matrix.variant == 'Release' && inputs.os == 'ubuntu' }}
+    - name: Upload artifact (non-windows)
+      if: ${{ matrix.variant == 'Release' && inputs.os != 'windows' }}
       uses: actions/upload-artifact@v4
       with:
         name: ${{ env.OUTPUT_BINARY }}