Refactor some environment variables for cibuildwheel

Author: molinav

.github/workflows/build.yml

@@ -56,24 +56,12 @@ jobs:
               echo "GEOS_DIR set to: ${GEOS_DIR}"
               cd "{package}"
               python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
-            # LD_LIBRARY_PATH in environment is needed by auditwheel.
-            environment: >-
-              GEOS_VERSION="3.6.5"
-              GEOS_DIR="/project/packages/basemap/extern"
-              LD_LIBRARY_PATH="/project/packages/basemap/extern/lib"
-              PIP_PREFER_BINARY=1
-              PYTHONUNBUFFERED=1
           - os: windows-latest
             before_all: >-
               echo Starting BEFORE_ALL script &&
               echo GEOS_DIR set to: %GEOS_DIR% &&
               cd "{package}" &&
               python -c "import utils; utils.GeosLibrary('%GEOS_VERSION%').build('%GEOS_DIR%', njobs=2)"
-            environment: >-
-              GEOS_VERSION="3.6.5"
-              GEOS_DIR="D:/a/basemap/basemap/packages/basemap/extern"
-              PIP_PREFER_BINARY=1
-              PYTHONUNBUFFERED=1
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -93,12 +81,21 @@ jobs:
       - name: Build wheels
         uses: pypa/[email protected]
         env:
-          CIBW_ARCHS_LINUX: auto64
           CIBW_BUILD_VERBOSITY: 1
+          CIBW_ARCHS_LINUX: auto64
           CIBW_BUILD: "cp39* cp310* cp311* cp312*"
           CIBW_SKIP: "pp* *-musllinux_* *-win32 *-manylinux_i686 *-musllinux_i686 *-aarch64 *-armv7l"
           CIBW_BEFORE_ALL: ${{ matrix.before_all }}
-          CIBW_ENVIRONMENT: ${{ matrix.environment }}
+          CIBW_ENVIRONMENT: >-
+            GEOS_VERSION="3.6.5"
+            PIP_PREFER_BINARY=1
+            PYTHONUNBUFFERED=1
+          CIBW_ENVIRONMENT_LINUX: >-
+            GEOS_DIR="/project/packages/basemap/extern"
+            LD_LIBRARY_PATH="${GEOS_DIR}/lib"
+          # LD_LIBRARY_PATH is needed by auditwheel.
+          CIBW_ENVIRONMENT_WINDOWS: >-
+            GEOS_DIR="D:/a/basemap/basemap/packages/basemap/extern"
         with:
           package-dir: "packages/basemap"
           output-dir: "packages/basemap/dist"