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 28, 2024
1 parent a730062 commit bf5a98c
Showing 1 changed file with 24 additions and 22 deletions.
46 changes: 24 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,9 @@ 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 }}
host: macos-latest
- os: web

## Currently not easily supported from GitHub actions.
Expand Down Expand Up @@ -137,13 +141,13 @@ jobs:
go install fyne.io/fyne/v2/cmd/fyne@latest ||
go get fyne.io/fyne/v2/cmd/fyne@latest
- name: Install Podman
- name: Set up QEMU
if: ${{ runner.os == 'macos' }}
run: |
brew install podman
podman machine init
podman machine start
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
if: ${{ runner.os == 'macos' }}
uses: docker/setup-buildx-action@v3

- name: Build
working-directory: calculator
run: |
Expand All @@ -170,11 +174,9 @@ 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 }}
host: macos-latest

## Currently not easily supported from GitHub actions.
## https://github.com/fyne-io/fyne-cross/pull/104#issuecomment-1099494308
Expand Down Expand Up @@ -219,13 +221,13 @@ jobs:
go install fyne.io/fyne/v2/cmd/fyne@latest ||
go get fyne.io/fyne/v2/cmd/fyne@latest
- name: Install Podman
- name: Set up QEMU
if: ${{ runner.os == 'macos' }}
run: |
brew install podman
podman machine init
podman machine start
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
if: ${{ runner.os == 'macos' }}
uses: docker/setup-buildx-action@v3
- name: Build
working-directory: terminal
run: |
Expand Down

0 comments on commit bf5a98c

Please sign in to comment.