diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2024-04-24 09:58:06 -0700 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2024-04-25 16:07:17 -0400 |
| commit | b732070a642e7cdbf95886ef23a4e5b8d4737042 (patch) | |
| tree | 2525dacfed60fae4676423abd10e31890081f13c | |
| parent | d40e679c4798b4d3ae90e09ee376ddc0df0a0054 (diff) | |
| download | meson-b732070a642e7cdbf95886ef23a4e5b8d4737042.tar.gz | |
CI/MacOS: move some things out of the run script into the env key
| -rw-r--r-- | .github/workflows/macos.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 772d4ff96..0e68d241e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -105,13 +105,13 @@ jobs: CPPFLAGS: "-I/opt/homebrew/include" LDFLAGS: "-L/opt/homebrew/lib" MESON_ARGS: --unity=${{ matrix.unity }} + XML_CATALOG_FILES: "/opt/homebrew/etc/xml/catalog" CI: 1 # These cannot evaluate anything, so we cannot set PATH or SDKROOT here run: | export SDKROOT="$(xcodebuild -version -sdk macosx Path)" export PATH="$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/llvm/bin:/opt/homebrew/opt/ncurses/bin:$PATH" export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@5/lib/pkgconfig:/opt/homebrew/opt/lapack/lib/pkgconfig:/opt/homebrew/opt/ncurses/lib/pkgconfig:$PKG_CONFIG_PATH" - export XML_CATALOG_FILES="/opt/homebrew/etc/xml/catalog" ./tools/run_with_cov.py ./run_project_tests.py --backend=ninja - name: Aggregate coverage reports |