diff options
| author | Oneric <oneric@oneric.stub> | 2022-11-11 21:55:50 +0100 |
|---|---|---|
| committer | Oneric <oneric@oneric.stub> | 2022-11-11 21:55:50 +0100 |
| commit | d4a7ebb02fc7bfc3e1ce00e72bfa0cf1585f176f (patch) | |
| tree | 265d5e202a59eefbd71df44ad90d00f539e98d61 | |
| parent | 44beae2ae57790ba592b8f0d20c0b51006f6b7c7 (diff) | |
| download | libass-d4a7ebb02fc7bfc3e1ce00e72bfa0cf1585f176f.tar.bz2 libass-d4a7ebb02fc7bfc3e1ce00e72bfa0cf1585f176f.tar.xz | |
ci/gha: replace matrix.package_prefix
MSYS2 already defines a $MINGW_PACKAGE_PREFIX environment variable
making it superfluous to explicit track the matching prefix ourselves.
The local $pre variable is kept to make the package list more readable.
| -rw-r--r-- | .github/workflows/ghci.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.github/workflows/ghci.yml b/.github/workflows/ghci.yml index 024aad3..e1a8494 100644 --- a/.github/workflows/ghci.yml +++ b/.github/workflows/ghci.yml @@ -50,7 +50,6 @@ jobs: cc: gcc api: desktop shell: 'msys2 {0}' - package_prefix: mingw-w64-i686 # Add a best-effort build for UWP apps for Microsoft Store - os: windows-2019 msystem: UCRT64 @@ -58,7 +57,6 @@ jobs: api: app extra_cflags: -DWINAPI_FAMILY=WINAPI_FAMILY_APP -specs=/tmp/windowsapp.specs shell: 'msys2 {0}' - package_prefix: mingw-w64-ucrt-x86_64 defaults: run: @@ -108,7 +106,7 @@ jobs: brew install automake fribidi harfbuzz nasm ;; windows-*) - pre="${{ matrix.package_prefix }}" + pre="$MINGW_PACKAGE_PREFIX" pacman --noconfirm -S \ automake autoconf libtool nasm make \ $pre-pkg-config $pre-gcc \ |