MacOS ARM64 now available on Github Actions

FreeFem · Jun 19, 2024 · ec71f34 · ec71f34
1 parent 5b3bc44
commit ec71f34
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/.github/workflows/release-dmg-arm.yml b/.github/workflows/release-dmg-arm.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   macos:
     name: DMG release
-    runs-on: [self-hosted, macos, ARM64]
+    runs-on: macos-latest
 
     env:
       CC: clang
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@main
 
       - name: Install
-        run: brew install gcc coreutils wget m4 flex bison autoconf automake
+        run: brew install gcc coreutils
 
       - name: Version
         id: version
@@ -32,12 +32,6 @@ jobs:
           echo "prefix=/Applications/FreeFem++.app/Contents/ff-$VERSION" >> $GITHUB_OUTPUT
           echo "dmg_dir=FreeFEM-$VERSION-$ARCH" >> $GITHUB_OUTPUT
 
-      - name: Cleanup
-        run: |
-          VERSION=${{ steps.version.outputs.version }}
-
-          sudo rm -rf "/Applications/FreeFem++.app/Contents/ff-$VERSION"
-
       - name: Prepare
         run: |
           PREFIX=${{ steps.version.outputs.prefix }}
@@ -56,8 +50,7 @@ jobs:
         run: |
           PREFIX=${{ steps.version.outputs.prefix }}
 
-          # tar zxvf AutoGeneratedFile.tar.gz
-          autoreconf -i
+          tar zxvf AutoGeneratedFile.tar.gz
           ./configure --enable-optim --enable-generic --enable-download --enable-m64 \
             --prefix="$PREFIX" \
             "CXXFLAGS=-Wno-undefined-var-template" \

diff --git a/.github/workflows/release-dmg.yml b/.github/workflows/release-dmg.yml
@@ -1,14 +1,15 @@
 name: Release MacOS Intel
 on:
-  workflow_run:
-    workflows: ['Release']
-    types:
-      - completed
+  push
+  # workflow_run:
+  #   workflows: ['Release']
+  #   types:
+  #     - completed
 
 jobs:
   macos:
     name: DMG release
-    runs-on: macos-latest
+    runs-on: macos-13
 
     env:
       CC: clang