From 86b78b0c759c4094be7ea0013a2d0d69c0d4de7a Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Sun, 19 Nov 2023 09:31:14 +0100
Subject: [PATCH] build: update build script / workflow

---
 .docker/build-linux.sh         | 14 +++++++-------
 .docker/install-static-libs.sh | 12 ++++++------
 .github/workflows/build.yml    | 19 ++++++++++---------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/.docker/build-linux.sh b/.docker/build-linux.sh
index c82dfce8..4063124a 100644
--- a/.docker/build-linux.sh
+++ b/.docker/build-linux.sh
@@ -29,16 +29,16 @@ esac
 
 case "-$BUILD_TYPE-" in
   *-gcc-*)
-    export CC=gcc CXX=g++
+    export CC=gcc-13 CXX=g++-13
     ;;
-  *-clang-*)
-    export CC=clang CXX=clang++
-    ;;
-  *-gcc12-*)
+  *-oldgcc-*)
     export CC=gcc-12 CXX=g++-12
     ;;
-  *-clang15-*)
-    export CC=clang-15 CXX=clang++-15
+  *-clang-*)
+    export CC=clang-17 CXX=clang++-17
+    ;;
+  *-oldclang-*)
+    export CC=clang-16 CXX=clang++-16
     ;;
   *)
     echo "missing compiler in: $BUILD_TYPE"
diff --git a/.docker/install-static-libs.sh b/.docker/install-static-libs.sh
index cddabf01..d85e6c02 100644
--- a/.docker/install-static-libs.sh
+++ b/.docker/install-static-libs.sh
@@ -6,18 +6,18 @@ cd "$HOME"
 mkdir pkgs
 cd pkgs
 
-wget https://github.com/libarchive/libarchive/releases/download/v3.6.2/libarchive-3.6.2.tar.xz
-wget ftp://ftp.astron.com/pub/file/file-5.44.tar.gz
+wget https://github.com/libarchive/libarchive/releases/download/v3.7.2/libarchive-3.7.2.tar.xz
+wget ftp://ftp.astron.com/pub/file/file-5.45.tar.gz
 
-tar xf libarchive-3.6.2.tar.xz
-cd libarchive-3.6.2
+tar xf libarchive-3.7.2.tar.xz
+cd libarchive-3.7.2
 ./configure --prefix=/opt/static-libs --without-iconv --without-xml2 --without-expat
 make -j$(nproc)
 make install
 
 cd "$HOME/pkgs"
-tar xf file-5.44.tar.gz
-cd file-5.44
+tar xf file-5.45.tar.gz
+cd file-5.45
 ./configure --prefix=/opt/static-libs --enable-static=yes --enable-shared=no
 make -j$(nproc)
 make install
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dd2a25a9..93ac7a72 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -76,20 +76,21 @@ jobs:
           - amd64
           - arm64v8
         build_type:
-          - gcc-debug-make
-          - gcc12-debug-ninja
-          - gcc12-release-ninja
-          - clang15-release-ninja
-          - clang15-release-ninja-static
+          - gcc-debug-ninja
+          - gcc-release-ninja
+          - oldgcc-debug-make
+          - clang-release-ninja
+          - clang-release-ninja-static
+          - oldclang-debug-make
         include:
           - arch: amd64
-            build_type: clang15-asan-ninja
+            build_type: clang-asan-ninja
           - arch: amd64
-            build_type: clang15-tsan-ninja
+            build_type: clang-tsan-ninja
           - arch: amd64
-            build_type: clang15-ubsan-ninja
+            build_type: clang-ubsan-ninja
           - arch: amd64
-            build_type: gcc12-debug-noperfmon-ninja
+            build_type: gcc-debug-noperfmon-ninja
 
     runs-on:
       - self-hosted