Enable darwin on darwin build.

fyne-io · Apr 28, 2024 · ad0b880 · ad0b880
1 parent a730062
commit ad0b880
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,5 +1,10 @@
 name: "CI"
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  workflow_dispatch:
 
 jobs:
   lint:
@@ -88,10 +93,10 @@ jobs:
           - os: freebsd
           - os: android
             args: -app-id calc.sha${{ github.sha }}
-          ## Not shared darwin image is available at the moment
-          # - os: darwin
-          #  args: -app-id calc.sha${{ github.sha }}
-          #  host: macos-latest
+          - os: darwin
+            args: -app-id calc.sha${{ github.sha }}
+          # Only macos-13 is supported as macos-14 is running in a VM on Mac M1 which are incompatible with docker/podman
+            host: macos-13
           - os: web
 
           ## Currently not easily supported from GitHub actions.
@@ -143,7 +148,7 @@ jobs:
           brew install podman
           podman machine init
           podman machine start
-            
+  
       - name: Build
         working-directory: calculator
         run: |
@@ -170,11 +175,10 @@ jobs:
           - os: freebsd
           - os: android
             args: -app-id calc.sha${{ github.sha }}
-          ## Not shared darwin image is available at the moment
-          # - os: darwin
-          #  args: -app-id calc.sha${{ github.sha }}
-          #  host: macos-latest
-          # - os: web
+          - os: darwin
+            args: -app-id calc.sha${{ github.sha }}
+          # Only macos-13 is supported as macos-14 is running in a VM on Mac M1 which are incompatible with docker/podman
+            host: macos-13
 
           ## Currently not easily supported from GitHub actions.
           ## https://github.com/fyne-io/fyne-cross/pull/104#issuecomment-1099494308
@@ -218,14 +222,14 @@ jobs:
         run: |
           go install fyne.io/fyne/v2/cmd/fyne@latest ||
           go get fyne.io/fyne/v2/cmd/fyne@latest
-
+          
       - name: Install Podman
         if: ${{ runner.os == 'macos' }}
         run: |
           brew install podman
           podman machine init
           podman machine start
-
+ 
       - name: Build
         working-directory: terminal
         run: |