Skip to content

Commit 8880aec

Browse files
Checkout first and pass environment variables
1 parent 2187a1b commit 8880aec

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

.github/workflows/wheels.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ jobs:
4545
os: [windows-latest, macos-latest]
4646

4747
steps:
48+
- uses: actions/checkout@v2
49+
with:
50+
submodules: true
51+
4852
- name: Cache Geant4 install
4953
uses: actions/cache@v2
5054
id: g4cache
@@ -155,9 +159,12 @@ jobs:
155159
--config Release
156160
--target install
157161
158-
- uses: actions/checkout@v2
159-
with:
160-
submodules: true
162+
- name: Setup environment variables
163+
shell: bash
164+
run: |
165+
echo "${{ github.workspace }}/${{ env.GEANT4_INSTALL_DIR }}/bin" >> $GITHUB_PATH
166+
echo "${{ github.workspace }}/${{ env.XERCES_C_INSTALL_DIR }}/bin" >> $GITHUB_PATH
167+
echo "CMAKE_ARGS=-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded" >> $GITHUB_ENV
161168
162169
- name: Extra Licenses
163170
shell: bash
@@ -167,18 +174,9 @@ jobs:
167174
curl "https://raw.githubusercontent.com/apache/xerces-c/${{ env.XERCES_C_GIT_REF }}/NOTICE" >> EXTRA_LICENSES
168175
echo -e "\n\n" >> EXTRA_LICENSES
169176
curl "https://raw.githubusercontent.com/apache/xerces-c/${{ env.XERCES_C_GIT_REF }}/LICENSE" >> EXTRA_LICENSES
170-
177+
171178
- uses: pypa/cibuildwheel@v2.2.2
172179
env:
173-
CIBW_ENVIRONMENT_MACOS: >
174-
PATH="$PATH:${{ github.workspace }}/${{ env.GEANT4_INSTALL_DIR }}/bin"
175-
PATH="$PATH:${{ github.workspace }}/${{ env.XERCES_C_INSTALL_DIR }}/bin"
176-
177-
CIBW_ENVIRONMENT_WINDOWS: >
178-
PATH="${{ github.workspace }}/${{ env.GEANT4_INSTALL_DIR }}/bin;$PATH"
179-
PATH="${{ github.workspace }}/${{ env.XERCES_C_INSTALL_DIR }}/bin;$PATH"
180-
CMAKE_ARGS="-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded"
181-
182180
CIBW_BUILD: cp3*
183181
CIBW_ARCHS: native
184182

@@ -207,7 +205,7 @@ jobs:
207205
208206
- uses: pypa/cibuildwheel@v2.2.2
209207
env:
210-
CIBW_ENVIRONMENT_LINUX: "CXXFLAGS='-fPIC' CFLAGS='-fPIC'"
208+
CIBW_ENVIRONMENT_LINUX: CXXFLAGS='-fPIC' CFLAGS='-fPIC'
211209
CIBW_BEFORE_ALL_LINUX: >
212210
python -m pip install cmake && \
213211
\

0 commit comments

Comments
 (0)