CI: fix even more brokenness in the macos CI

Commit 191449f608 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: #12644
Fixes: #12681
pull/12685/head
Eli Schwartz 11 months ago
parent e110faed27
commit 8e366b8759
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
  1. 5
      .github/workflows/macos.yml

@ -101,7 +101,6 @@ jobs:
CPPFLAGS: "-I/usr/local/include" CPPFLAGS: "-I/usr/local/include"
LDFLAGS: "-L/usr/local/lib" LDFLAGS: "-L/usr/local/lib"
MESON_ARGS: --unity=${{ matrix.unity }} MESON_ARGS: --unity=${{ matrix.unity }}
HOMEBREW_NO_AUTO_UPDATE: 1
CI: 1 CI: 1
# These cannot evaluate anything, so we cannot set PATH or SDKROOT here # These cannot evaluate anything, so we cannot set PATH or SDKROOT here
run: | run: |
@ -124,13 +123,13 @@ jobs:
Qt4macos: Qt4macos:
runs-on: macos-latest runs-on: macos-latest
env:
HOMEBREW_NO_AUTO_UPDATE: 1
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
with: with:
python-version: '3.x' python-version: '3.x'
- env:
HOMEBREW_NO_AUTO_UPDATE: 1
- run: python -m pip install -e . - run: python -m pip install -e .
- run: brew install pkg-config ninja gcc - run: brew install pkg-config ninja gcc
- run: brew tap cartr/qt4 - run: brew tap cartr/qt4

Loading…
Cancel
Save