Skip to content

Commit

Permalink
Try to fix macOS build
Browse files Browse the repository at this point in the history
It can't find `webp/demux.h` any more for some reason.
  • Loading branch information
rohansingh committed Apr 26, 2024
1 parent 3d17082 commit c29ffd2
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 7 deletions.
22 changes: 19 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,34 @@ jobs:
- name: Build frontend
run: npm run build

- name: Build
- name: Build Linux
run: make build
if: matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-latest'

- name: Build macOS
run: make build
if: matrix.os == 'macos-latest'
env:
LIBRARY_PATH: "/opt/homebrew/lib"
CGO_CPPFLAGS: "-I/opt/homebrew/include"

- name: Build Windows
shell: msys2 {0}
run: |
set MSYSTEM=MINGW64
make build
if: matrix.os == 'windows-latest'

- name: Test
- name: Test Linux
run: make test
if: matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-latest'
if: matrix.os == 'ubuntu-22.04'

- name: Test macOS
run: make test
if: matrix.os == 'macos-latest'
env:
LIBRARY_PATH: "/opt/homebrew/lib"
CGO_CPPFLAGS: "-I/opt/homebrew/include"

- name: Test Windows
shell: msys2 {0}
Expand Down Expand Up @@ -126,6 +140,8 @@ jobs:
run: make release-macos
env:
PIXLET_VERSION: ${{ steps.vars.outputs.tag }}
LIBRARY_PATH: "/opt/homebrew/lib"
CGO_CPPFLAGS: "-I/opt/homebrew/include"

- name: Build Release Windows
if: matrix.os == 'windows-latest'
Expand Down
22 changes: 18 additions & 4 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,16 @@ jobs:
- name: Build frontend
run: npm run build

- name: Build
- name: Build Linux
run: make build
if: matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-latest'
if: matrix.os == 'ubuntu-22.04'

- name: Build macOS
run: make build
if: matrix.os == 'macos-latest'
env:
LIBRARY_PATH: "/opt/homebrew/lib"
CGO_CPPFLAGS: "-I/opt/homebrew/include"

- name: Build Windows
shell: msys2 {0}
Expand All @@ -89,9 +96,16 @@ jobs:
make build
if: matrix.os == 'windows-latest'

- name: Test
- name: Test Linux
run: make test
if: matrix.os == 'ubuntu-22.04'

- name: Test macOS
run: make test
if: matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-latest'
if: matrix.os == 'macos-latest'
env:
LIBRARY_PATH: "/opt/homebrew/lib"
CGO_CPPFLAGS: "-I/opt/homebrew/include"

- name: Test Windows
shell: msys2 {0}
Expand Down

0 comments on commit c29ffd2

Please sign in to comment.