Skip to content

Commit 24ab5c6

Browse files
Skip musllinux but try apt install if yum fails
1 parent 8880aec commit 24ab5c6

File tree

1 file changed

+34
-36
lines changed

1 file changed

+34
-36
lines changed

.github/workflows/wheels.yml

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ jobs:
177177
178178
- uses: pypa/cibuildwheel@v2.2.2
179179
env:
180-
CIBW_BUILD: cp3*
181180
CIBW_ARCHS: native
182181

183182
- uses: actions/upload-artifact@v2
@@ -207,41 +206,40 @@ jobs:
207206
env:
208207
CIBW_ENVIRONMENT_LINUX: CXXFLAGS='-fPIC' CFLAGS='-fPIC'
209208
CIBW_BEFORE_ALL_LINUX: >
210-
python -m pip install cmake && \
211-
\
212-
git clone https://github.com/apache/xerces-c \
213-
"{package}/${{ env.XERCES_C_SOURCE_DIR }}" && \
214-
cd "{package}/${{ env.XERCES_C_SOURCE_DIR }}" && \
215-
git checkout ${{ env.XERCES_C_GIT_REF }} && \
216-
mkdir "{package}/${{ env.XERCES_C_BUILD_DIR }}" && \
217-
cd "{package}/${{ env.XERCES_C_BUILD_DIR }}" && \
218-
cmake \
219-
-Dnetwork-accessor=socket \
220-
-Dtranscoder=iconv \
221-
-DBUILD_SHARED_LIBS=OFF \
222-
"{package}/${{ env.XERCES_C_SOURCE_DIR }}" && \
223-
make -j8 && \
224-
make install && \
225-
\
226-
yum install -y libXt-devel libXmu-devel && \
227-
git clone -b ${{ env.GEANT4_GIT_TAG }} --depth 1 \
228-
https://github.com/Geant4/geant4 \
229-
"{package}/${{ env.GEANT4_SOURCE_DIR }}" && \
230-
mkdir "{package}/${{ env.GEANT4_BUILD_DIR }}" && \
231-
cd "{package}/${{ env.GEANT4_BUILD_DIR }}" && \
232-
cmake \
233-
-DCMAKE_BUILD_TYPE=Release \
234-
-DBUILD_STATIC_LIBS=ON \
235-
-DBUILD_SHARED_LIBS=OFF \
236-
-DGEANT4_INSTALL_EXAMPLES=OFF \
237-
-DGEANT4_USE_SYSTEM_EXPAT=OFF \
238-
-DGEANT4_USE_GDML=ON \
239-
-DGEANT4_USE_OPENGL_X11=ON \
240-
"{package}/${{ env.GEANT4_SOURCE_DIR }}" && \
241-
make -j8 && \
242-
make install
243-
244-
CIBW_BUILD: cp3*
209+
python -m pip install cmake &&
210+
git clone https://github.com/apache/xerces-c
211+
"{package}/${{ env.XERCES_C_SOURCE_DIR }}" &&
212+
cd "{package}/${{ env.XERCES_C_SOURCE_DIR }}" &&
213+
git checkout ${{ env.XERCES_C_GIT_REF }} &&
214+
mkdir "{package}/${{ env.XERCES_C_BUILD_DIR }}" &&
215+
cd "{package}/${{ env.XERCES_C_BUILD_DIR }}" &&
216+
cmake
217+
-Dnetwork-accessor=socket
218+
-Dtranscoder=iconv
219+
-DBUILD_SHARED_LIBS=OFF
220+
"{package}/${{ env.XERCES_C_SOURCE_DIR }}" &&
221+
make -j8 &&
222+
make install &&
223+
yum install -y libXt-devel libXmu-devel ||
224+
apt-get install -y libxt-dev libxmu-dev &&
225+
git clone -b ${{ env.GEANT4_GIT_TAG }} --depth 1
226+
https://github.com/Geant4/geant4
227+
"{package}/${{ env.GEANT4_SOURCE_DIR }}" &&
228+
mkdir "{package}/${{ env.GEANT4_BUILD_DIR }}" &&
229+
cd "{package}/${{ env.GEANT4_BUILD_DIR }}" &&
230+
cmake
231+
-DCMAKE_BUILD_TYPE=Release
232+
-DBUILD_STATIC_LIBS=ON
233+
-DBUILD_SHARED_LIBS=OFF
234+
-DGEANT4_INSTALL_EXAMPLES=OFF
235+
-DGEANT4_USE_SYSTEM_EXPAT=OFF
236+
-DGEANT4_USE_GDML=ON
237+
-DGEANT4_USE_OPENGL_X11=ON
238+
"{package}/${{ env.GEANT4_SOURCE_DIR }}" &&
239+
make -j8 &&
240+
make install
241+
242+
CIBW_SKIP: "*-musllinux*"
245243
CIBW_ARCHS: native
246244

247245
- uses: actions/upload-artifact@v2

0 commit comments

Comments
 (0)