Skip to content

Commit

Permalink
Enable darwin on darwin build.
Browse files Browse the repository at this point in the history
  • Loading branch information
Cedric BAIL committed Apr 29, 2024
1 parent a730062 commit 14c9c04
Showing 1 changed file with 20 additions and 22 deletions.
42 changes: 20 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
name: "CI"
on: [push, pull_request]
on:
push:
branches:
- master
pull_request:
workflow_dispatch:

jobs:
lint:
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -137,13 +142,10 @@ jobs:
go install fyne.io/fyne/v2/cmd/fyne@latest ||
go get fyne.io/fyne/v2/cmd/fyne@latest
- name: Install Podman
- name: Install Docker
if: ${{ runner.os == 'macos' }}
run: |
brew install podman
podman machine init
podman machine start
uses: douglascamata/setup-docker-macos-action@v1-alpha

- name: Build
working-directory: calculator
run: |
Expand All @@ -170,11 +172,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
Expand Down Expand Up @@ -219,13 +220,10 @@ jobs:
go install fyne.io/fyne/v2/cmd/fyne@latest ||
go get fyne.io/fyne/v2/cmd/fyne@latest
- name: Install Podman
- name: Install Docker
if: ${{ runner.os == 'macos' }}
run: |
brew install podman
podman machine init
podman machine start
uses: douglascamata/setup-docker-macos-action@v1-alpha

- name: Build
working-directory: terminal
run: |
Expand Down

0 comments on commit 14c9c04

Please sign in to comment.