Merge pull request #531 from ptondereau/fix-macos-arm-static-build

Re-active static-darwin-arm64 build
jolicode · Oct 14, 2024 · 1e257b8 · 1e257b8
2 parents 4da82ef + 15776f0
commit 1e257b8
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 35 deletions.
diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
@@ -125,43 +125,43 @@ jobs:
           path: ./castor.darwin-amd64
           if-no-files-found: error
 
-  # static-darwin-arm64:
-  #   needs: phars
-  #   name: Create MacOs arm64 static binary and upload
-  #   runs-on: macos-14
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v4
-
-  #     - uses: ./.github/actions/install
-
-  #     - uses: ./.github/actions/cache
-  #       with:
-  #         os: 'darwin'
-
-  #     - name: retrieve phar artifacts
-  #       uses: actions/download-artifact@v4
-  #       with:
-  #         path: tools/phar/build
-  #         merge-multiple: true
-
-  #     - uses: ./.github/actions/static
-  #       with:
-  #         os: 'darwin-arm64'
-  #       env:
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  #     - name: Upload the MacOs arm64 static binary
-  #       uses: actions/upload-artifact@v4
-  #       with:
-  #         name: 'castor.darwin-arm64'
-  #         path: ./castor.darwin-arm64
-  #         if-no-files-found: error
+  static-darwin-arm64:
+    needs: phars
+    name: Create MacOs arm64 static binary and upload
+    runs-on: macos-14
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - uses: ./.github/actions/install
+
+      - uses: ./.github/actions/cache
+        with:
+          os: "darwin"
+
+      - name: retrieve phar artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: tools/phar/build
+          merge-multiple: true
+
+      - uses: ./.github/actions/static
+        with:
+          os: "darwin-arm64"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload the MacOs arm64 static binary
+        uses: actions/upload-artifact@v4
+        with:
+          name: "castor.darwin-arm64"
+          path: ./castor.darwin-arm64
+          if-no-files-found: error
 
   release:
     name: Upload artifacts to the release
     if: github.event_name == 'release'
-    needs: [phars, static-linux-amd64, static-darwin-amd64]
+    needs: [phars, static-linux-amd64, static-darwin-amd64, static-darwin-arm64]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -177,7 +177,7 @@ jobs:
         run: |
           gh release upload ${{ github.ref_name }} ./build/castor.darwin-amd64
           gh release upload ${{ github.ref_name }} ./build/castor.darwin-amd64.phar
-          # gh release upload ${{ github.ref_name }} ./build/castor.darwin-arm64
+          gh release upload ${{ github.ref_name }} ./build/castor.darwin-arm64
           gh release upload ${{ github.ref_name }} ./build/castor.darwin-arm64.phar
           gh release upload ${{ github.ref_name }} ./build/castor.linux-amd64
           gh release upload ${{ github.ref_name }} ./build/castor.linux-amd64.phar

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,14 @@
 * Do not validate commande options/args as soon as `#[AsRawTokens] is used
 * Update all PHP vendor
 
+### Fixes
+
+* Re-active `static-darwin-arm64` binary build
+
+### Vendor
+
+* Update SPC version to v2.3.5
+
 ## 0.18.2 (2024-09-03)
 
 * Do not build static-darwin-arm64 binary anymore (may be temporary)

diff --git a/src/Console/Command/CompileCommand.php b/src/Console/Command/CompileCommand.php
@@ -20,7 +20,7 @@ class CompileCommand extends Command
     // When something **important** related to the compilation changed, increase
     // this version to invalide the cache
     private const CACHE_VERSION = '2';
-    private const DEFAULT_SPC_VERSION = '2.3.1';
+    private const DEFAULT_SPC_VERSION = '2.3.5';
 
     public function __construct(
         private readonly HttpClientInterface $httpClient,