Merge pull request #1040 from openmultiplayer/amir/ci

all my homies hate linux (not the kernel btw, the ecosystem btw) (btw)
openmultiplayer · Jan 11, 2025 · ec7d3ce · ec7d3ce
2 parents 33a24a5 + 5798497
commit ec7d3ce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 158 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/docker/build_ubuntu-18.04/Dockerfile b/docker/build_ubuntu-18.04/Dockerfile
@@ -6,14 +6,7 @@ RUN \
         gpg \
         wget \
     && \
-    wget -O- https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
-    gpg --dearmor - | \
-    tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
-    echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' | \
-    tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
-    apt-get update && \
     apt-get install -y \
-        cmake \
         ninja-build \
         clang-10 \
         python3-pip \
@@ -22,6 +15,10 @@ RUN \
         libstdc++6:i386 \
         libc6:i386 \
     && \
+    wget https://cmake.org/files/v3.20/cmake-3.20.6-linux-x86_64.tar.gz  && \
+    tar zxvf cmake-3.20.6-linux-x86_64.tar.gz && \
+    mv cmake-3.20.6-linux-x86_64       /opt/cmake-3.20.6 && \
+    ln -sf  /opt/cmake-3.20.6/bin/*    /usr/bin/ && \
     useradd -m user && \
     su user -c 'pip3 install --user -v "conan==1.57.0"'
 

diff --git a/docker/build_ubuntu-20.04/Dockerfile b/docker/build_ubuntu-20.04/Dockerfile
@@ -6,21 +6,18 @@ RUN \
         gpg \
         wget \
     && \
-    wget -O- https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
-    gpg --dearmor - | \
-    tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
-    echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | \
-    tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
-    apt-get update && \
     apt-get install -y \
-        cmake \
         ninja-build \
         clang-10 \
         python3-pip \
         gcc-9-multilib \
         g++-9-multilib \
         libstdc++-10-dev:i386 \
     && \
+    wget https://cmake.org/files/v3.20/cmake-3.20.6-linux-x86_64.tar.gz  && \
+    tar zxvf cmake-3.20.6-linux-x86_64.tar.gz && \
+    mv cmake-3.20.6-linux-x86_64       /opt/cmake-3.20.6 && \
+    ln -sf  /opt/cmake-3.20.6/bin/*    /usr/bin/ && \
     useradd -m user && \
     su user -c 'pip3 install --user -v "conan==1.57.0"'