Skip to content

Commit

Permalink
CI(deps): Update echoix/setup-OSGeo4W action to v0.2.0 (OSGeo#4749)
Browse files Browse the repository at this point in the history
* CI(deps): Update echoix/setup-OSGeo4W action to v0.2.0

* CI(OSGeo4W): Use setup-OSGeo4W's root path output

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Edouard Choinière <27212526+echoix@users.noreply.github.com>
  • Loading branch information
renovate[bot] and echoix authored Nov 24, 2024
1 parent bea8435 commit 3e22b87
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/osgeo4w.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ jobs:
mingw-w64-x86_64-pcre

- name: Setup OSGeo4W environment
uses: echoix/setup-OSGeo4W@17deecd39e077a80bf1081443998ea8edd6f15bf # v0.1.0
uses: echoix/setup-OSGeo4W@f4311523e39f2c8b10e34ebbc3f2ff437ecfb9ed # v0.2.0
id: osgeo4w
with:
package-dir: "D:/OSGeo4W_pkg"
packages: |
Expand Down Expand Up @@ -96,7 +97,9 @@ jobs:
run: .github/workflows/print_versions.sh

- name: Test executing of the grass command
run: .github/workflows/test_simple.bat 'C:\OSGeo4W\opt\grass\grass85.bat'
run: .github/workflows/test_simple.bat '${{env.O4WROOT}}\opt\grass\grass85.bat'
env:
O4WROOT: ${{ steps.osgeo4w.outputs.root }}

- name: Test executing of the grass command in bash
shell: msys2 {0}
Expand All @@ -116,7 +119,9 @@ jobs:
shell: cmd /D /E:ON /V:OFF /S /C "CALL C:/OSGeo4W/OSGeo4W.bat "{0}""

- name: Run tests
run: .github/workflows/test_thorough.bat 'C:\OSGeo4W\opt\grass\grass85.bat' 'C:\OSGeo4W\bin\python3'
run: .github/workflows/test_thorough.bat '${{env.O4WROOT}}\opt\grass\grass85.bat' '${{env.O4WROOT}}\bin\python3'
env:
O4WROOT: ${{ steps.osgeo4w.outputs.root }}

- name: Make HTML test report available
if: ${{ always() }}
Expand Down

0 comments on commit 3e22b87

Please sign in to comment.