Update CHANGELOG.md and fix nits

HGuillemet · Jul 5, 2024 · 24f305c · 24f305c
1 parent 4db72e6
commit 24f305c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/actions/deploy-macosx/action.yml b/.github/actions/deploy-macosx/action.yml
@@ -35,18 +35,19 @@ runs:
 
         FORMULAE=()
         if [[ -n ${CI_DEPLOY_NEED_GCC:-} ]]; then
+            echo Installing an older less buggy version of GCC
             brew install gcc@13
             brew link --overwrite gcc@13
             echo Removing "fixed" header files that are actually broken
-            rm -Rf $(find /opt/homebrew/Cellar/gcc@13/ -iname include-fixed) 
+            rm -Rf $(find /opt/homebrew/Cellar/gcc@13/ -iname include-fixed)
             FORMULAE+="gcc@13"
         fi
 
         # Change rpath and resign all brew libraries that could be bundled in presets
         FORMULAE+=("libomp" "sdl2" "libusb")
         for i in $FORMULAE; do
           for l in $(brew ls $i|grep -e ".dylib$"); do
-            if [ ! -L $l ]; then 
+            if [ ! -L $l ]; then
               install_name_tool -add_rpath @loader_path/. -id @rpath/$(basename $l) $l
               codesign --force -s - $l
             fi

diff --git a/.github/workflows/scipy.yml b/.github/workflows/scipy.yml
@@ -41,11 +41,11 @@ jobs:
   macosx-arm64:
     runs-on: macos-14
     steps:
-      - uses: HGuillemet/javacpp-presets/.github/actions/deploy-macosx@scipy-macosx-arm64
+      - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
   macosx-x86_64:
     runs-on: macos-12
     steps:
-      - uses: HGuillemet/javacpp-presets/.github/actions/deploy-macosx@scipy-macosx-arm64
+      - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
 #  windows-x86:
 #    runs-on: windows-2019
 #    steps:
@@ -55,7 +55,7 @@ jobs:
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
   redeploy:
-    needs: [linux-x86_64, macosx-x86_64, windows-x86_64]
+    needs: [linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64]
 #    needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64]
     runs-on: ubuntu-20.04
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
 
- * Introduce `macosx-arm64` builds for CPython ([pull #1511](https://github.com/bytedeco/javacpp-presets/pull/1511)), NumPy ([pull #1515](https://github.com/bytedeco/javacpp-presets/pull/1515))
+ * Introduce `macosx-arm64` builds for CPython ([pull #1511](https://github.com/bytedeco/javacpp-presets/pull/1511)), NumPy ([pull #1515](https://github.com/bytedeco/javacpp-presets/pull/1515)), SciPy ([pull #1516](https://github.com/bytedeco/javacpp-presets/pull/1516))
  * Update and fix the sample code of the presets for LLVM ([pull #1501](https://github.com/bytedeco/javacpp-presets/pull/1501))
  * Fix Vulkan GPU acceleration for FFmpeg ([pull #1497](https://github.com/bytedeco/javacpp-presets/pull/1497))
  * Build FFmpeg with zimg to enable zscale filter ([pull #1481](https://github.com/bytedeco/javacpp-presets/pull/1481))