Drop sccache stuff.

2024-06-02 07:20:47 +00:00 · 2021-02-05 12:49:21 -06:00 · 2021-02-05 12:49:21 -06:00 · 2ff2d33ef3
commit 2ff2d33ef3
parent 89e3b05fb4
7 changed files with 193 additions and 252 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -8,14 +8,8 @@ stages:
  - deploy

 variables:
-  SCCACHE_GCS_BUCKET: btm-build-cache
-  SCCACHE_GCS_RW_MODE: READ_WRITE
-  SCCACHE_GCS_KEY_PATH: /tmp/storage-key.json
  DOCKER_DRIVER: overlay2

-before_script:
-  - echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH
-
 .pull_images: &pull_images
  stage: pull
  allow_failure: true
@ -188,8 +182,6 @@ builder centos7 clang-5: *docker_builder
    - >
      cmake
      -DCMAKE_EXE_LINKER_FLAGS=$LINKER_FLAGS
-      -DCMAKE_C_COMPILER_LAUNCHER=sccache
-      -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
      -DMAINTAINER_MODE=ON
      -DBUILD_AUDACIOUS=$BUILD_AUDACIOUS
      -DBUILD_MYSQL=ON
@ -346,7 +338,6 @@ centos7 gcc-7:
    BUILD_JOURNAL: "OFF"
  before_script:
    - source /opt/rh/devtoolset-7/enable
-    - echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH

 centos7 gcc-8:
  <<: *build_stages
@ -363,7 +354,6 @@ centos7 gcc-8:
    BUILD_JOURNAL: "OFF"
  before_script:
    - source /opt/rh/devtoolset-8/enable
-    - echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH

 centos7 clang-5:
  <<: *build_stages
@ -379,7 +369,6 @@ centos7 clang-5:
    BUILD_JOURNAL: "OFF"
  before_script:
    - source /opt/rh/llvm-toolset-7/enable
-    - echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH

 # .freebsd_deps: &freebsd_deps
 #   retry:
@ -504,8 +493,6 @@ centos7 clang-5:
        ..
      else
        cmake \
-        -DCMAKE_C_COMPILER_LAUNCHER=sccache \
-        -DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
        -DBUILD_TESTS=ON \
        -DMAINTAINER_MODE=ON \
        ..
@ -527,8 +514,6 @@ centos7 clang-5:
        ..
      else
        cmake \
-        -DCMAKE_C_COMPILER_LAUNCHER=sccache \
-        -DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
        -DRELEASE=ON \
        ..
@ -660,7 +645,6 @@ test centos7 clang-5:
    CXX: clang++
  before_script:
    - source /opt/rh/llvm-toolset-7/enable
-    - echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH

 test centos7 gcc-7:
  <<: *test_stages
@ -672,7 +656,6 @@ test centos7 gcc-7:
    CXX: g++
  before_script:
    - source /opt/rh/devtoolset-7/enable
-    - echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH

 test centos7 gcc-8:
  <<: *test_stages
@ -684,7 +667,6 @@ test centos7 gcc-8:
    CXX: g++
  before_script:
    - source /opt/rh/devtoolset-8/enable
-    - echo $GCS_STORAGE_KEY > $SCCACHE_GCS_KEY_PATH

 # test freebsd12 clang-7:
 #   <<: *freebsd_deps
@ -728,8 +710,6 @@ check clang-tidy:
    - cd build
    - >
      cmake
-      -DCMAKE_C_COMPILER_LAUNCHER=sccache
-      -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
      -DMAINTAINER_MODE=ON
      -DCHECK_CODE_QUALITY=ON
      ..
@ -748,8 +728,6 @@ check clang-format:
    - cd build
    - >
      cmake
-      -DCMAKE_C_COMPILER_LAUNCHER=sccache
-      -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
      -DMAINTAINER_MODE=ON
      -DCHECK_CODE_QUALITY=ON
      ..
--- a/tests/dockerfiles/Dockerfile.centos7-base
+++ b/tests/dockerfiles/Dockerfile.centos7-base
@ -1,69 +1,63 @@
 FROM centos:7

-ENV SCCACHE_VER=0.2.8
-
 RUN yum update -y -q \
-    && yum -y -q install \
-    epel-release \
-    centos-release-scl \
-    && yum -y -q install \
-    cairo-devel \
-    dbus-glib-devel \
-    docbook2X \
-    freetype-devel \
-    gcc \
-    git \
-    imlib2-devel \
-    lcov \
-    libcurl-devel \
-    libical-devel \
-    libircclient-devel \
-    libmicrohttpd-devel \
-    librsvg2-devel \
-    libX11-devel \
-    libXdamage-devel \
-    libXext-devel \
-    libXft-devel \
-    libXinerama-devel \
-    libxml2-devel \
-    make \
-    man \
-    mysql-devel \
-    ncurses-devel \
-    openssl-devel \
-    patch \
-    pulseaudio-libs-devel \
-    readline-devel \
-    && curl -sL https://github.com/mozilla/sccache/releases/download/${SCCACHE_VER}/sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz -o sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz \
-    && tar xf sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz \
-    && cp sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl/sccache /usr/bin \
-    && rm -rf sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl* \
-    && curl -L https://github.com/Kitware/CMake/releases/download/v3.13.4/cmake-3.13.4-Linux-x86_64.sh -o cmake-3.13.4-Linux-x86_64.sh \
-    && chmod +x cmake-3.13.4-Linux-x86_64.sh \
-    && ./cmake-3.13.4-Linux-x86_64.sh --prefix=/usr --skip-license \
-    && rm cmake-3.13.4-Linux-x86_64.sh \
-    && mkdir /luabuild \
-    && pushd /luabuild \
-    && curl -R -O http://www.lua.org/ftp/lua-5.3.5.tar.gz \
-    && tar zxf lua-5.3.5.tar.gz \
-    && cd lua-5.3.5 \
-    && make -j4 linux MYCFLAGS=-fPIC MYLDFLAGS=-fPIC \
-    && make install INSTALL_TOP=/usr \
-    && popd \
-    && rm -rf /luabuild \
-    && mkdir -p /usr/lib/pkgconfig \
-    && echo $'\
-V= 5.3\n\
-R= 5.3.5\n\
-prefix= /usr\n\
-exec_prefix=${prefix}\n\
-libdir= /usr/lib\n\
-includedir=${prefix}/include\n\
-\n\
-Name: Lua\n\
-Description: An Extensible Extension Language\n\
-Version: ${R}\n\
-Requires:\n\
-Libs: -llua -lm -ldl\n\
-Cflags: -I${includedir}' \
->> /usr/lib64/pkgconfig/lua.pc
+  && yum -y -q install \
+  epel-release \
+  centos-release-scl \
+  && yum -y -q install \
+  cairo-devel \
+  dbus-glib-devel \
+  docbook2X \
+  freetype-devel \
+  gcc \
+  git \
+  imlib2-devel \
+  lcov \
+  libcurl-devel \
+  libical-devel \
+  libircclient-devel \
+  libmicrohttpd-devel \
+  librsvg2-devel \
+  libX11-devel \
+  libXdamage-devel \
+  libXext-devel \
+  libXft-devel \
+  libXinerama-devel \
+  libxml2-devel \
+  make \
+  man \
+  mysql-devel \
+  ncurses-devel \
+  openssl-devel \
+  patch \
+  pulseaudio-libs-devel \
+  readline-devel \
+  && curl -L https://github.com/Kitware/CMake/releases/download/v3.13.4/cmake-3.13.4-Linux-x86_64.sh -o cmake-3.13.4-Linux-x86_64.sh \
+  && chmod +x cmake-3.13.4-Linux-x86_64.sh \
+  && ./cmake-3.13.4-Linux-x86_64.sh --prefix=/usr --skip-license \
+  && rm cmake-3.13.4-Linux-x86_64.sh \
+  && mkdir /luabuild \
+  && pushd /luabuild \
+  && curl -R -O http://www.lua.org/ftp/lua-5.3.5.tar.gz \
+  && tar zxf lua-5.3.5.tar.gz \
+  && cd lua-5.3.5 \
+  && make -j4 linux MYCFLAGS=-fPIC MYLDFLAGS=-fPIC \
+  && make install INSTALL_TOP=/usr \
+  && popd \
+  && rm -rf /luabuild \
+  && mkdir -p /usr/lib/pkgconfig \
+  && echo $'\
+  V= 5.3\n\
+  R= 5.3.5\n\
+  prefix= /usr\n\
+  exec_prefix=${prefix}\n\
+  libdir= /usr/lib\n\
+  includedir=${prefix}/include\n\
+  \n\
+  Name: Lua\n\
+  Description: An Extensible Extension Language\n\
+  Version: ${R}\n\
+  Requires:\n\
+  Libs: -llua -lm -ldl\n\
+  Cflags: -I${includedir}' \
+  >> /usr/lib64/pkgconfig/lua.pc
--- a/tests/dockerfiles/Dockerfile.fedora-29-base
+++ b/tests/dockerfiles/Dockerfile.fedora-29-base
@ -1,42 +1,36 @@
 FROM fedora:29

-ENV SCCACHE_VER=0.2.8
-
 RUN dnf update -y -q \
-    && dnf -y -q install \
-    audacious-devel \
-    cairo-devel \
-    cmake \
-    dbus-glib-devel \
-    docbook2X \
-    freetype-devel \
-    git \
-    imlib2-devel \
-    lcov \
-    libcurl-devel \
-    libical-devel \
-    libircclient-devel \
-    libmicrohttpd-devel \
-    librsvg2-devel \
-    libX11-devel \
-    libXdamage-devel \
-    libXext-devel \
-    libXft-devel \
-    libXinerama-devel \
-    libxml2-devel \
-    libXNVCtrl-devel \
-    lua-devel \
-    make \
-    man \
-    mysql-devel \
-    ncurses-devel \
-    openssl-devel \
-    patch \
-    pulseaudio-libs-devel \
-    readline-devel \
-    systemd-devel \
-    xmms2-devel \
-    && curl -sL https://github.com/mozilla/sccache/releases/download/${SCCACHE_VER}/sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz -o sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz \
-    && tar xf sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz \
-    && cp sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl/sccache /usr/bin \
-    && rm -rf sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl*
+  && dnf -y -q install \
+  audacious-devel \
+  cairo-devel \
+  cmake \
+  dbus-glib-devel \
+  docbook2X \
+  freetype-devel \
+  git \
+  imlib2-devel \
+  lcov \
+  libcurl-devel \
+  libical-devel \
+  libircclient-devel \
+  libmicrohttpd-devel \
+  librsvg2-devel \
+  libX11-devel \
+  libXdamage-devel \
+  libXext-devel \
+  libXft-devel \
+  libXinerama-devel \
+  libxml2-devel \
+  libXNVCtrl-devel \
+  lua-devel \
+  make \
+  man \
+  mysql-devel \
+  ncurses-devel \
+  openssl-devel \
+  patch \
+  pulseaudio-libs-devel \
+  readline-devel \
+  systemd-devel \
+  xmms2-devel
--- a/tests/dockerfiles/Dockerfile.fedora-31-base
+++ b/tests/dockerfiles/Dockerfile.fedora-31-base
@ -1,42 +1,36 @@
 FROM fedora:31

-ENV SCCACHE_VER=0.2.8
-
 RUN dnf update -y -q \
-    && dnf -y -q install \
-    audacious-devel \
-    cairo-devel \
-    cmake \
-    dbus-glib-devel \
-    docbook2X \
-    freetype-devel \
-    git \
-    imlib2-devel \
-    lcov \
-    libcurl-devel \
-    libical-devel \
-    libircclient-devel \
-    libmicrohttpd-devel \
-    librsvg2-devel \
-    libX11-devel \
-    libXdamage-devel \
-    libXext-devel \
-    libXft-devel \
-    libXinerama-devel \
-    libxml2-devel \
-    libXNVCtrl-devel \
-    lua-devel \
-    make \
-    man \
-    mysql-devel \
-    ncurses-devel \
-    openssl-devel \
-    patch \
-    pulseaudio-libs-devel \
-    readline-devel \
-    systemd-devel \
-    xmms2-devel \
-    && curl -sL https://github.com/mozilla/sccache/releases/download/${SCCACHE_VER}/sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz -o sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz \
-    && tar xf sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz \
-    && cp sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl/sccache /usr/bin \
-    && rm -rf sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl*
+  && dnf -y -q install \
+  audacious-devel \
+  cairo-devel \
+  cmake \
+  dbus-glib-devel \
+  docbook2X \
+  freetype-devel \
+  git \
+  imlib2-devel \
+  lcov \
+  libcurl-devel \
+  libical-devel \
+  libircclient-devel \
+  libmicrohttpd-devel \
+  librsvg2-devel \
+  libX11-devel \
+  libXdamage-devel \
+  libXext-devel \
+  libXft-devel \
+  libXinerama-devel \
+  libxml2-devel \
+  libXNVCtrl-devel \
+  lua-devel \
+  make \
+  man \
+  mysql-devel \
+  ncurses-devel \
+  openssl-devel \
+  patch \
+  pulseaudio-libs-devel \
+  readline-devel \
+  systemd-devel \
+  xmms2-devel 
--- a/tests/dockerfiles/Dockerfile.fedora-32-base
+++ b/tests/dockerfiles/Dockerfile.fedora-32-base
@ -1,42 +1,36 @@
 FROM fedora:32

-ENV SCCACHE_VER=0.2.8
-
 RUN dnf update -y -q \
-    && dnf -y -q install \
-    audacious-devel \
-    cairo-devel \
-    cmake \
-    dbus-glib-devel \
-    docbook2X \
-    freetype-devel \
-    git \
-    imlib2-devel \
-    lcov \
-    libcurl-devel \
-    libical-devel \
-    libircclient-devel \
-    libmicrohttpd-devel \
-    librsvg2-devel \
-    libX11-devel \
-    libXdamage-devel \
-    libXext-devel \
-    libXft-devel \
-    libXinerama-devel \
-    libxml2-devel \
-    libXNVCtrl-devel \
-    lua-devel \
-    make \
-    man \
-    mysql-devel \
-    ncurses-devel \
-    openssl-devel \
-    patch \
-    pulseaudio-libs-devel \
-    readline-devel \
-    systemd-devel \
-    xmms2-devel \
-    && curl -sL https://github.com/mozilla/sccache/releases/download/${SCCACHE_VER}/sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz -o sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz \
-    && tar xf sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz \
-    && cp sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl/sccache /usr/bin \
-    && rm -rf sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl*
+  && dnf -y -q install \
+  audacious-devel \
+  cairo-devel \
+  cmake \
+  dbus-glib-devel \
+  docbook2X \
+  freetype-devel \
+  git \
+  imlib2-devel \
+  lcov \
+  libcurl-devel \
+  libical-devel \
+  libircclient-devel \
+  libmicrohttpd-devel \
+  librsvg2-devel \
+  libX11-devel \
+  libXdamage-devel \
+  libXext-devel \
+  libXft-devel \
+  libXinerama-devel \
+  libxml2-devel \
+  libXNVCtrl-devel \
+  lua-devel \
+  make \
+  man \
+  mysql-devel \
+  ncurses-devel \
+  openssl-devel \
+  patch \
+  pulseaudio-libs-devel \
+  readline-devel \
+  systemd-devel \
+  xmms2-devel
--- a/tests/dockerfiles/Dockerfile.fedora-33-base
+++ b/tests/dockerfiles/Dockerfile.fedora-33-base
@ -1,42 +1,36 @@
 FROM fedora:33

-ENV SCCACHE_VER=0.2.8
-
 RUN dnf update -y -q \
-    && dnf -y -q install \
-    audacious-devel \
-    cairo-devel \
-    cmake \
-    dbus-glib-devel \
-    docbook2X \
-    freetype-devel \
-    git \
-    imlib2-devel \
-    lcov \
-    libcurl-devel \
-    libical-devel \
-    libircclient-devel \
-    libmicrohttpd-devel \
-    librsvg2-devel \
-    libX11-devel \
-    libXdamage-devel \
-    libXext-devel \
-    libXft-devel \
-    libXinerama-devel \
-    libxml2-devel \
-    libXNVCtrl-devel \
-    lua-devel \
-    make \
-    man \
-    mysql-devel \
-    ncurses-devel \
-    openssl-devel \
-    patch \
-    pulseaudio-libs-devel \
-    readline-devel \
-    systemd-devel \
-    xmms2-devel \
-    && curl -sL https://github.com/mozilla/sccache/releases/download/${SCCACHE_VER}/sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz -o sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz \
-    && tar xf sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz \
-    && cp sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl/sccache /usr/bin \
-    && rm -rf sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl*
+  && dnf -y -q install \
+  audacious-devel \
+  cairo-devel \
+  cmake \
+  dbus-glib-devel \
+  docbook2X \
+  freetype-devel \
+  git \
+  imlib2-devel \
+  lcov \
+  libcurl-devel \
+  libical-devel \
+  libircclient-devel \
+  libmicrohttpd-devel \
+  librsvg2-devel \
+  libX11-devel \
+  libXdamage-devel \
+  libXext-devel \
+  libXft-devel \
+  libXinerama-devel \
+  libxml2-devel \
+  libXNVCtrl-devel \
+  lua-devel \
+  make \
+  man \
+  mysql-devel \
+  ncurses-devel \
+  openssl-devel \
+  patch \
+  pulseaudio-libs-devel \
+  readline-devel \
+  systemd-devel \
+  xmms2-devel
--- a/tests/dockerfiles/Dockerfile.ubuntu-base
+++ b/tests/dockerfiles/Dockerfile.ubuntu-base
@ -1,7 +1,5 @@
 FROM ubuntu:focal

-ENV SCCACHE_VER=0.2.8
-
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive \
  apt-get install -qy --no-install-recommends \
@ -36,10 +34,5 @@ RUN apt-get update \
  libxnvctrl-dev \
  man \
  ncurses-dev \
-  software-properties-common \
-  wget \
-  && wget -q https://github.com/mozilla/sccache/releases/download/${SCCACHE_VER}/sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz -O sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz \
-  && tar xf sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl.tar.gz \
-  && cp sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl/sccache /usr/bin \
-  && rm -rf sccache-${SCCACHE_VER}-x86_64-unknown-linux-musl*
+  software-properties-common