From 97344c7b081b42545b694f16680c595aaac0c668 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 28 Mar 2022 16:24:26 +0200 Subject: [PATCH] Revert "CI: fix build issue on CMake build-windows-conda config (refs #5513)" This reverts commit 4424fde8780ff1e0bbda4918d08293e3e92acc4e. Conda has updated to a fixed Poppler package Fixes #5513 --- .github/workflows/cmake_builds.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/cmake_builds.yml b/.github/workflows/cmake_builds.yml index d523459c9ef1..0a08f350b2bd 100644 --- a/.github/workflows/cmake_builds.yml +++ b/.github/workflows/cmake_builds.yml @@ -308,12 +308,10 @@ jobs: cmake --version - name: Install dependency shell: bash -l {0} - # We pin poppler to 21.03.0, as the 22.01.0 update breaks GDAL - # cf https://github.com/OSGeo/gdal/issues/5513 run: | conda install --yes --quiet --name gdalenv curl libiconv icu python=3.9 swig numpy pytest pytest-env zlib clcache lxml conda install --yes --quiet --name gdalenv -c conda-forge proj geos hdf4 hdf5 kealib \ - libnetcdf openjpeg poppler==21.03.0 libtiff libpng xerces-c expat libxml2 kealib json-c \ + libnetcdf openjpeg poppler libtiff libpng xerces-c expat libxml2 kealib json-c \ cfitsio freexl geotiff jpeg libpq libspatialite libwebp-base pcre pcre2 postgresql \ sqlite tiledb zstd cryptopp cgal doxygen librttopo libkml openssl xz \ openjdk ant qhull armadillo blas blas-devel libblas libcblas liblapack liblapacke blosc