From: Joel Rosdahl <joel@rosdahl.net>
Date: Fri, 5 Mar 2021 06:13:53 +0000 (+0100)
Subject: ci: Fix build on Ubuntu 18.04
X-Git-Tag: v4.2.1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59202ffbe57cc81679c02abafd2222819e4bde41;p=thirdparty%2Fccache.git

ci: Fix build on Ubuntu 18.04

For some reason libzstd1-dev now has broken dependencies in GitLab’s
Ubuntu 18.04 environment. Fix this by installing libzstd-dev instead.
---

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c222a199c..662f491d0 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -92,11 +92,10 @@ jobs:
             sudo apt-get update
 
             # Install ld.gold (binutils) and ld.lld on different runs.
-            # Binding to Ubuntu 20 has no special meaning.
-            if [ "${{ matrix.config.os }}" = "ubuntu-20.04" ]; then
-              sudo apt-get install -y ninja-build elfutils libzstd-dev lld
-            else
+            if [ "${{ matrix.config.os }}" = "ubuntu-16.04" ]; then
               sudo apt-get install -y ninja-build elfutils libzstd1-dev binutils
+            else
+              sudo apt-get install -y ninja-build elfutils libzstd-dev lld
             fi
 
             if [ "${{ matrix.config.compiler }}" = "gcc" ]; then
@@ -160,7 +159,7 @@ jobs:
             BUILDDIR: .
             CCACHE_LOC: .
             CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=Debug -DENABLE_TRACING=1 -DCMAKE_CXX_STANDARD=14
-            apt_get: elfutils libzstd1-dev
+            apt_get: elfutils libzstd-dev
 
           - name: Linux GCC 32-bit
             os: ubuntu-18.04
@@ -180,7 +179,7 @@ jobs:
             CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=CI -DZSTD_FROM_INTERNET=ON
             ENABLE_CACHE_CLEANUP_TESTS: 1
             CUDA: 10.1.243-1
-            apt_get: elfutils libzstd1-dev
+            apt_get: elfutils libzstd-dev
 
           - name: Linux MinGW 32-bit
             os: ubuntu-18.04
@@ -258,13 +257,13 @@ jobs:
             os: ubuntu-18.04
             EXTRA_CMAKE_BUILD_FLAGS: --target doc-html
             RUN_TESTS: none
-            apt_get: libzstd1-dev asciidoc docbook-xml docbook-xsl
+            apt_get: libzstd-dev asciidoc docbook-xml docbook-xsl
 
           - name: Manual page
             os: ubuntu-18.04
             EXTRA_CMAKE_BUILD_FLAGS: --target doc-man-page
             RUN_TESTS: none
-            apt_get: libzstd1-dev asciidoc xsltproc docbook-xml docbook-xsl
+            apt_get: libzstd-dev asciidoc xsltproc docbook-xml docbook-xsl
 
           - name: Clang-Tidy
             os: ubuntu-18.04
diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml
index 972b6b9a1..b19e80763 100644
--- a/.github/workflows/codeql-analysis.yaml
+++ b/.github/workflows/codeql-analysis.yaml
@@ -31,7 +31,7 @@ jobs:
         fetch-depth: 2
 
     - name: Install dependencies
-      run: sudo apt-get update && sudo apt-get install ninja-build elfutils libzstd1-dev
+      run: sudo apt-get update && sudo apt-get install ninja-build elfutils libzstd-dev
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1