Skip to content

Commit ec7d3ce

Browse files
authored
Merge pull request #1040 from openmultiplayer/amir/ci
all my homies hate linux (not the kernel btw, the ecosystem btw) (btw)
2 parents 33a24a5 + 5798497 commit ec7d3ce

File tree

3 files changed

+8
-158
lines changed

3 files changed

+8
-158
lines changed

.github/workflows/release.yml

-144
This file was deleted.

docker/build_ubuntu-18.04/Dockerfile

+4-7
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@ RUN \
66
gpg \
77
wget \
88
&& \
9-
wget -O- https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
10-
gpg --dearmor - | \
11-
tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
12-
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' | \
13-
tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
14-
apt-get update && \
159
apt-get install -y \
16-
cmake \
1710
ninja-build \
1811
clang-10 \
1912
python3-pip \
@@ -22,6 +15,10 @@ RUN \
2215
libstdc++6:i386 \
2316
libc6:i386 \
2417
&& \
18+
wget https://cmake.org/files/v3.20/cmake-3.20.6-linux-x86_64.tar.gz && \
19+
tar zxvf cmake-3.20.6-linux-x86_64.tar.gz && \
20+
mv cmake-3.20.6-linux-x86_64 /opt/cmake-3.20.6 && \
21+
ln -sf /opt/cmake-3.20.6/bin/* /usr/bin/ && \
2522
useradd -m user && \
2623
su user -c 'pip3 install --user -v "conan==1.57.0"'
2724

docker/build_ubuntu-20.04/Dockerfile

+4-7
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,18 @@ RUN \
66
gpg \
77
wget \
88
&& \
9-
wget -O- https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
10-
gpg --dearmor - | \
11-
tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
12-
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | \
13-
tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
14-
apt-get update && \
159
apt-get install -y \
16-
cmake \
1710
ninja-build \
1811
clang-10 \
1912
python3-pip \
2013
gcc-9-multilib \
2114
g++-9-multilib \
2215
libstdc++-10-dev:i386 \
2316
&& \
17+
wget https://cmake.org/files/v3.20/cmake-3.20.6-linux-x86_64.tar.gz && \
18+
tar zxvf cmake-3.20.6-linux-x86_64.tar.gz && \
19+
mv cmake-3.20.6-linux-x86_64 /opt/cmake-3.20.6 && \
20+
ln -sf /opt/cmake-3.20.6/bin/* /usr/bin/ && \
2421
useradd -m user && \
2522
su user -c 'pip3 install --user -v "conan==1.57.0"'
2623

0 commit comments

Comments
 (0)