Skip to content

Commit 91cccab

Browse files
committed
Merge branch 'linux_manylinux2014_x86_64_build'
2 parents bd1d4e3 + d1771c3 commit 91cccab

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.github/workflows/build-deploy.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ on:
1010
branches:
1111
- main
1212

13+
env:
14+
BUILD_DIR: build
15+
ARTIFACT_DIR: artifacts
16+
1317
jobs:
1418
build-windows:
1519
runs-on: windows-latest
1620
env:
17-
BUILD_DIR: build
18-
ARTIFACT_DIR: artifacts
1921
CC: C:/ProgramData/mingw64/mingw64/bin/gcc.exe
2022
CXX: C:/ProgramData/mingw64/mingw64/bin/g++.exe
2123

Dockerfile.linux

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ FROM quay.io/pypa/manylinux2014_x86_64
33

44
# install required build tools
55
RUN yum install -y \
6-
gcc-toolset-10 \
76
make \
87
cmake3 \
98
git \
@@ -13,9 +12,6 @@ RUN yum install -y \
1312
libtool \
1413
&& yum clean all
1514

16-
# c++17 support
17-
SHELL ["/opt/rh/devtoolset-10/root/usr/bin/bash", "-c"]
18-
1915
WORKDIR /work
2016

2117
# environment variables

0 commit comments

Comments
 (0)