Skip to content

Commit

Permalink
CI(OSGeo4w): Sort and split msys packages into separate lines (OSGeo#…
Browse files Browse the repository at this point in the history
…4747)

* CI(OSGeo4W): Split msys2 package list to separate sorted lines

* CI(OSGeo4W): Use pacboy to write shorter package names

The suffix `:p` means to install for the current env only (MINGW_PACKAGE_PREFIX). This allows to have the same package name for different msys2 environments

* CI(OSGeo4W): Remove pacboy suffixes

Not needed since msys2/pactoys#6 changed the defaults when no suffix, and doesn't install for `mingw32` and `mingw64` anymore, only for the current env
  • Loading branch information
echoix authored Dec 5, 2024
1 parent 8828094 commit 603b4e5
Showing 1 changed file with 26 additions and 6 deletions.
32 changes: 26 additions & 6 deletions .github/workflows/osgeo4w.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,32 @@ jobs:
location: D:\
update: true
msystem: MINGW64
install: tar libintl make bison flex diffutils git dos2unix zip mingw-w64-x86_64-toolchain
mingw-w64-x86_64-fftw mingw-w64-x86_64-openblas mingw-w64-x86_64-pkgconf
mingw-w64-x86_64-gcc mingw-w64-x86_64-ccache mingw-w64-x86_64-zlib mingw-w64-x86_64-libiconv
mingw-w64-x86_64-bzip2 mingw-w64-x86_64-gettext mingw-w64-x86_64-libsystre
mingw-w64-x86_64-libtre-git mingw-w64-x86_64-libwinpthread-git mingw-w64-x86_64-libpng
mingw-w64-x86_64-pcre
install: >-
bison
diffutils
dos2unix
flex
git
libintl
make
tar
zip
pacboy: >-
bzip2
ccache
fftw
gcc
gettext
libiconv
libpng
libsystre
libtre-git
libwinpthread-git
openblas
pcre
pkgconf
toolchain
zlib
- name: Setup OSGeo4W environment
uses: echoix/setup-OSGeo4W@f4311523e39f2c8b10e34ebbc3f2ff437ecfb9ed # v0.2.0
Expand Down

0 comments on commit 603b4e5

Please sign in to comment.