From 58537bf7c3a11d3e5276e617c0bce48b36a8144a Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Tue, 29 Jul 2025 18:46:34 +0800 Subject: [PATCH 1/6] CI: Install gdal with png and jpeg support --- ci/install-dependencies-windows.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install-dependencies-windows.sh b/ci/install-dependencies-windows.sh index 68564ffcc5e..1b2f913e5fe 100755 --- a/ci/install-dependencies-windows.sh +++ b/ci/install-dependencies-windows.sh @@ -19,7 +19,7 @@ PACKAGE="${PACKAGE:-false}" WIN_PLATFORM=x64-windows # install libraries -vcpkg install netcdf-c gdal[core,tools,geos,netcdf] pcre2 fftw3[core,threads] clapack openblas --triplet ${WIN_PLATFORM} +vcpkg install netcdf-c gdal[core,tools,geos,netcdf,png,jpeg] pcre2 fftw3[core,threads] clapack openblas --triplet ${WIN_PLATFORM} # Executable files search for DLL files in the directories listed in the PATH environment variable. echo "${VCPKG_INSTALLATION_ROOT}/installed/${WIN_PLATFORM}/bin" >> $GITHUB_PATH # Tools like gdal_translate, ogr2ogr are located in tools/gdal From 32b02b97c854722c2b35a7dd6eeee4af5188d4a9 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Tue, 29 Jul 2025 19:13:11 +0800 Subject: [PATCH 2/6] Add option flag --recurse --- ci/install-dependencies-windows.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install-dependencies-windows.sh b/ci/install-dependencies-windows.sh index 1b2f913e5fe..668fc29993c 100755 --- a/ci/install-dependencies-windows.sh +++ b/ci/install-dependencies-windows.sh @@ -19,7 +19,7 @@ PACKAGE="${PACKAGE:-false}" WIN_PLATFORM=x64-windows # install libraries -vcpkg install netcdf-c gdal[core,tools,geos,netcdf,png,jpeg] pcre2 fftw3[core,threads] clapack openblas --triplet ${WIN_PLATFORM} +vcpkg install --recurse netcdf-c gdal[core,tools,geos,netcdf,png,jpeg] pcre2 fftw3[core,threads] clapack openblas --triplet ${WIN_PLATFORM} # Executable files search for DLL files in the directories listed in the PATH environment variable. echo "${VCPKG_INSTALLATION_ROOT}/installed/${WIN_PLATFORM}/bin" >> $GITHUB_PATH # Tools like gdal_translate, ogr2ogr are located in tools/gdal From f983d0d35ea7b7c625d533b5af9226bdce1c1ce3 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Tue, 29 Jul 2025 19:48:41 +0800 Subject: [PATCH 3/6] Temporarily trigger in current branch --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index afd66350ce9..e989b5ec1e0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,6 +8,7 @@ on: branches: - master - 6.[0-9]+ + - ci/win-vcpkg paths: - 'src/**' - 'test/**' From 07b30786dd12b0ce2456e619f8651491c4e5fdaf Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Tue, 29 Jul 2025 20:45:00 +0800 Subject: [PATCH 4/6] Enable more drivers --- ci/install-dependencies-windows.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install-dependencies-windows.sh b/ci/install-dependencies-windows.sh index 668fc29993c..798919273e5 100755 --- a/ci/install-dependencies-windows.sh +++ b/ci/install-dependencies-windows.sh @@ -19,7 +19,7 @@ PACKAGE="${PACKAGE:-false}" WIN_PLATFORM=x64-windows # install libraries -vcpkg install --recurse netcdf-c gdal[core,tools,geos,netcdf,png,jpeg] pcre2 fftw3[core,threads] clapack openblas --triplet ${WIN_PLATFORM} +vcpkg install --recurse netcdf-c gdal[core,tools,geos,netcdf,png,openjpeg,gif] pcre2 fftw3[core,threads] clapack openblas --triplet ${WIN_PLATFORM} # Executable files search for DLL files in the directories listed in the PATH environment variable. echo "${VCPKG_INSTALLATION_ROOT}/installed/${WIN_PLATFORM}/bin" >> $GITHUB_PATH # Tools like gdal_translate, ogr2ogr are located in tools/gdal From cccfbe6f700af680e158d372267467f91c311dfd Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 30 Jul 2025 00:52:40 +0800 Subject: [PATCH 5/6] Update install-dependencies-windows.sh --- ci/install-dependencies-windows.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install-dependencies-windows.sh b/ci/install-dependencies-windows.sh index 798919273e5..7e1deb61a71 100755 --- a/ci/install-dependencies-windows.sh +++ b/ci/install-dependencies-windows.sh @@ -19,7 +19,7 @@ PACKAGE="${PACKAGE:-false}" WIN_PLATFORM=x64-windows # install libraries -vcpkg install --recurse netcdf-c gdal[core,tools,geos,netcdf,png,openjpeg,gif] pcre2 fftw3[core,threads] clapack openblas --triplet ${WIN_PLATFORM} +vcpkg install --recurse netcdf-c gdal[core,tools,geos,netcdf,png,openjpeg,jpeg,gif] pcre2 fftw3[core,threads] clapack openblas --triplet ${WIN_PLATFORM} # Executable files search for DLL files in the directories listed in the PATH environment variable. echo "${VCPKG_INSTALLATION_ROOT}/installed/${WIN_PLATFORM}/bin" >> $GITHUB_PATH # Tools like gdal_translate, ogr2ogr are located in tools/gdal From 08d4b498dac1570352075fccd667df71ca7e9216 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 30 Jul 2025 10:59:55 +0800 Subject: [PATCH 6/6] Update .github/workflows/tests.yml --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e989b5ec1e0..afd66350ce9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,6 @@ on: branches: - master - 6.[0-9]+ - - ci/win-vcpkg paths: - 'src/**' - 'test/**'