Skip to content

Commit

Permalink
CI: fix even more brokenness in the macos CI
Browse files Browse the repository at this point in the history
Commit 191449f has numerous issues, and
being completely invalid yml syntax was just the tip of the iceberg.

In this case, it fails the github schema, which requires that env be
adjunct to a job or step definition, rather than its own thing. It did
not even make sense in context, since the purpose of the variable is to
modify brew.

Fixes: mesonbuild#12644
Fixes: mesonbuild#12681
  • Loading branch information
eli-schwartz committed Jan 2, 2024
1 parent e110fae commit 8e366b8
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ jobs:
CPPFLAGS: "-I/usr/local/include"
LDFLAGS: "-L/usr/local/lib"
MESON_ARGS: --unity=${{ matrix.unity }}
HOMEBREW_NO_AUTO_UPDATE: 1
CI: 1
# These cannot evaluate anything, so we cannot set PATH or SDKROOT here
run: |
Expand All @@ -124,13 +123,13 @@ jobs:

Qt4macos:
runs-on: macos-latest
env:
HOMEBREW_NO_AUTO_UPDATE: 1
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.x'
- env:
HOMEBREW_NO_AUTO_UPDATE: 1
- run: python -m pip install -e .
- run: brew install pkg-config ninja gcc
- run: brew tap cartr/qt4
Expand Down

0 comments on commit 8e366b8

Please sign in to comment.