Skip to content

Commit 7ec0521

Browse files
committed
fix
1 parent 63ab1c9 commit 7ec0521

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,6 @@ jobs:
140140
export TILEDB_PATH="${GITHUB_WORKSPACE//\\//}/_tiledb_core/dist"
141141
python -m pip install --verbose .[test]
142142
143-
- name: "Add DLL paths to PATH (Windows only)"
144-
if: inputs.libtiledb_ref && runner.os == 'Windows'
145-
run: |
146-
echo "${GITHUB_WORKSPACE//\\//}/_tiledb_core/dist/bin" >> $GITHUB_PATH
147-
echo "${GITHUB_WORKSPACE//\\//}/_tiledb_core/build/vcpkg_installed/x64-windows/bin" >> $GITHUB_PATH
148-
149143
- name: "Build and Install TileDB-Py (default)"
150144
if: ${{ !inputs.libtiledb_ref }}
151145
run: |
@@ -155,13 +149,23 @@ jobs:
155149
156150
- name: "Run tests"
157151
run: |
152+
# Add DLL paths to PATH on Windows when using custom TileDB
153+
if [[ "${{ runner.os }}" == "Windows" && -n "${{ inputs.libtiledb_ref }}" ]]; then
154+
export PATH="${GITHUB_WORKSPACE//\\//}/_tiledb_core/dist/bin:${GITHUB_WORKSPACE//\\//}/_tiledb_core/build/vcpkg_installed/x64-windows/bin:$PATH"
155+
fi
156+
158157
PROJECT_CWD=$PWD
159158
rm tiledb/__init__.py
160159
cd /tmp
161160
pytest -vv --showlocals $PROJECT_CWD
162161
163162
- name: "Re-run tests without pandas"
164163
run: |
164+
# Add DLL paths to PATH on Windows when using custom TileDB
165+
if [[ "${{ runner.os }}" == "Windows" && -n "${{ inputs.libtiledb_ref }}" ]]; then
166+
export PATH="${GITHUB_WORKSPACE//\\//}/_tiledb_core/dist/bin:${GITHUB_WORKSPACE//\\//}/_tiledb_core/build/vcpkg_installed/x64-windows/bin:$PATH"
167+
fi
168+
165169
pip uninstall -y pandas
166170
pytest -vv --showlocals $PROJECT_CWD
167171

0 commit comments

Comments
 (0)