From b732070a642e7cdbf95886ef23a4e5b8d4737042 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 24 Apr 2024 09:58:06 -0700 Subject: CI/MacOS: move some things out of the run script into the env key --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') 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 -- cgit v1.2.3