Skip to content

Commit bed3d4d

Browse files
committed
Unify setup of cibuildwheel environment variables in new workflow
1 parent 21368dc commit bed3d4d

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,12 @@ jobs:
5656
echo "GEOS_DIR set to: ${GEOS_DIR}"
5757
cd "{package}"
5858
python -c "import utils; utils.GeosLibrary('${GEOS_VERSION}').build('${GEOS_DIR}', njobs=2)"
59-
# LD_LIBRARY_PATH in environment is needed by auditwheel.
60-
environment: >-
61-
GEOS_VERSION="3.6.5"
62-
GEOS_DIR="$(pwd)/extern"
63-
LD_LIBRARY_PATH="${GEOS_DIR}/lib"
64-
PIP_PREFER_BINARY=1
65-
PYTHONUNBUFFERED=1
6659
- os: windows-latest
6760
before_all: >-
6861
echo Starting BEFORE_ALL script &&
6962
echo GEOS_DIR set to: %GEOS_DIR% &&
7063
cd "{package}" &&
7164
python -c "import utils; utils.GeosLibrary('%GEOS_VERSION%').build('%GEOS_DIR%', njobs=2)"
72-
environment: >-
73-
GEOS_VERSION="3.6.5"
74-
GEOS_DIR="$(pwd)/extern"
75-
PIP_PREFER_BINARY=1
76-
PYTHONUNBUFFERED=1
7765
runs-on: ${{ matrix.os }}
7866
steps:
7967
- uses: actions/checkout@v4
@@ -98,7 +86,13 @@ jobs:
9886
CIBW_BUILD: "cp39* cp310* cp311* cp312*"
9987
CIBW_SKIP: "pp* *-musllinux_* *-win32 *-manylinux_i686 *-musllinux_i686 *-aarch64 *-armv7l"
10088
CIBW_BEFORE_ALL: ${{ matrix.before_all }}
101-
CIBW_ENVIRONMENT: ${{ matrix.environment }}
89+
CIBW_ENVIRONMENT: >
90+
GEOS_VERSION="3.6.5"
91+
GEOS_DIR="$(pwd)/extern"
92+
PIP_PREFER_BINARY=1
93+
PYTHONUNBUFFERED=1
94+
LD_LIBRARY_PATH="${GEOS_DIR}/lib"
95+
# LD_LIBRARY_PATH in environment is needed by auditwheel (Linux).
10296
with:
10397
package-dir: "packages/basemap"
10498
output-dir: "packages/basemap/dist"

0 commit comments

Comments
 (0)