fix wcs using cfitsio without reentrant

MWATelescope · Jan 30, 2025 · 2130b22 · 2130b22
1 parent e149188
commit 2130b22
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 23 deletions.
diff --git a/.github/workflows/bottle.yml b/.github/workflows/bottle.yml
@@ -34,26 +34,29 @@ jobs:
 
       - run: brew test-bot --only-setup Formula/*
 
-      - name: test-bot
-        run: |
-          brew tap mwatelescope/tap
-          for package in cfitsio_reentrant casacore-data casacore aoflagger birli; do
-            brew test-bot mwatelescope/tap/$package
-          done
-      - name: audit
-        run: |
-          for package in cfitsio_reentrant wcslib casacore-data casacore aoflagger birli; do
-            brew audit mwatelescope/tap/$package
-          done
+      - name: add tap
+        run: brew tap mwatelescope/tap
+      # - name: test-bot
+      #   run: |
+      #     for package in casacore-data casacore aoflagger birli; do
+      #       brew test-bot mwatelescope/tap/$package
+      #     done
+      # - name: audit
+      #   run: |
+      #     for package in casacore-data casacore aoflagger birli; do
+      #       brew audit mwatelescope/tap/$package
+      #     done
 
       - name: Get version number from current date
         run: echo "DATE=$(date +'v%Y.%m.%d.%H.%M')" | tee -a "$GITHUB_ENV"
       - name: get archive names
         id: archive_names
         run: |
-          # build casacore source first
-          brew uninstall --ignore-dependencies --force cfitsio || true
-          for package in cfitsio_reentrant wcslib casacore-data casacore aoflagger birli; do
+          # next time this breaks:
+          # - publish only bottles where all dependencies are bottled
+          # - update the bottle do block in the formula
+          # todo: wcslib casacore aoflagger birli
+          for package in cfitsio_reentrant casacore-data; do
             brew uninstall --ignore-dependencies --force $package || true
             brew install --formula --build-bottle mwatelescope/tap/$package
             brew postinstall mwatelescope/tap/$package
@@ -70,32 +73,55 @@ jobs:
           tag_name: ${{ env.DATE }}
           release_name: Release ${{ env.DATE }}
           body: |
-            Brew bottles for casacore / aoflagger
+            Brew bottles for cfitsio_reentrant, casacore-data, aoflagger, birli
           draft: false
           prerelease: false
-      - name: Upload Aoflagger Release Asset
+      - name: Upload cfitsio_reentrant Release Asset
         uses: actions/upload-release-asset@v1
         continue-on-error: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ env.aoflagger_path }}
-          asset_name: ${{ env.aoflagger_path }}
+          asset_path: ${{ env.cfitsio_reentrant_path }}
+          asset_name: ${{ env.cfitsio_reentrant_path }}
           asset_content_type: application/gzip
-      - name: Upload Birli Release Asset
+      - name: Upload casacore-data Release Asset
         uses: actions/upload-release-asset@v1
         continue-on-error: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ env.birli_path }}
-          asset_name: ${{ env.birli_path }}
+          asset_path: ${{ env.casacore-data_path }}
+          asset_name: ${{ env.casacore-data_path }}
           asset_content_type: application/gzip
+      # - name: Upload Aoflagger Release Asset
+      #   uses: actions/upload-release-asset@v1
+      #   continue-on-error: true
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #   with:
+      #     upload_url: ${{ steps.create_release.outputs.upload_url }}
+      #     asset_path: ${{ env.aoflagger_path }}
+      #     asset_name: ${{ env.aoflagger_path }}
+      #     asset_content_type: application/gzip
+      # - name: Upload Birli Release Asset
+      #   uses: actions/upload-release-asset@v1
+      #   continue-on-error: true
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #   with:
+      #     upload_url: ${{ steps.create_release.outputs.upload_url }}
+      #     asset_path: ${{ env.birli_path }}
+      #     asset_name: ${{ env.birli_path }}
+      #     asset_content_type: application/gzip
 
 # TODO:
 # - run: brew test-bot mwatelescope/tap/wcslib
+# or
+# - run: brew test-bot mwatelescope/tap/cfitsio_reentrant
+# gives
 # ==> brew linkage --test mwatelescope/tap/wcslib
 # ==> FAILED
 # Full linkage --test mwatelescope/tap/wcslib output

diff --git a/Formula/wcslib.rb b/Formula/wcslib.rb
@@ -26,8 +26,8 @@ def install
     system "./configure", "--disable-debug",
                           "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
-                          "--with-cfitsiolib=#{Formula["cfitsio"].opt_lib}",
-                          "--with-cfitsioinc=#{Formula["cfitsio"].opt_include}",
+                          "--with-cfitsiolib=#{Formula["cfitsio_reentrant"].opt_lib}",
+                          "--with-cfitsioinc=#{Formula["cfitsio_reentrant"].opt_include}",
                           "--without-pgplot",
                           "--disable-fortran"
     system "make", "install"