From 11920118e186143f28d2eb9fa57010e6455c88a8 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 14 May 2024 20:43:38 +0200 Subject: [PATCH] CI: set the right environment for setup-msys2 and use the provided shell (#3709) CI builds for the mingw64 env, so actually use it. Otherwise various env vars are missing and PATH is wrong. Use the shell provided by setup-msys2 instead of calling bash directly, no need to hardcode paths then. --- .github/workflows/osgeo4w.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml index bf3402f211f..136b566f4da 100644 --- a/.github/workflows/osgeo4w.yml +++ b/.github/workflows/osgeo4w.yml @@ -38,6 +38,7 @@ jobs: path-type: inherit 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-lapack 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 @@ -65,13 +66,15 @@ jobs: shell: msys2 {0} - name: Compile GRASS GIS - run: D:\msys64\usr\bin\bash.exe -l (''+(Get-Location)+'\.github\workflows\build_osgeo4w.sh') (Get-Location) + shell: msys2 {0} + run: .github/workflows/build_osgeo4w.sh - name: Test executing of the grass command run: .github/workflows/test_simple.bat 'C:\OSGeo4W\opt\grass\grass84.bat' - name: Test executing of the grass command in bash - run: D:\msys64\usr\bin\bash.exe .github/workflows/test_simple.sh + shell: msys2 {0} + run: .github/workflows/test_simple.sh - name: Run tests run: .github/workflows/test_thorough.bat 'C:\OSGeo4W\opt\grass\grass84.bat' 'C:\OSGeo4W\bin\python3'