reapack

commit b0f9de0894c082e4e0f6becd9606c1fb443b8c62
parent c9e15f4b66a27908d3070c738f5e521531e49a43
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Wed,  5 Jan 2022 21:40:26 -0500

ci: fix Linux builds

Diffstat:
M
.appveyor.yml
 | 
14
+++++++-------

1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -2,7 +2,7 @@
 version: "{build}-{branch}"
 
 before_build:
-  - git submodule update --init
+  - git submodule update --init --depth 1
 
 build_script:
   - cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN
@@ -23,14 +23,11 @@ for:
       $1 == "deb" {
         $2 = "[arch=armhf,arm64]";
         $3 = "http://ports.ubuntu.com/ubuntu-ports/"
-      } 1' /etc/apt/sources.list | sudo dd of=/etc/apt/sources.list.d/ports.list
-      sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-
-      wget -q https://mirrors.edge.kernel.org/ubuntu/pool/universe/c/catch2/catch2_2.13.0-1_all.deb
+      } 1' /etc/apt/sources.list | sudo tee /etc/apt/sources.list.d/ports.list > /dev/null
 
       install-deps() {
         local arch="$1"; shift
-        local native=("$@" ./catch2*.deb php-cli qemu-user-binfmt)
+        local native=("$@" php-cli qemu-user-binfmt)
         local target=(
           libboost-dev libcurl4-openssl-dev libsqlite3-dev libssl-dev
           libxml2-dev zlib1g-dev
@@ -38,9 +35,12 @@ for:
 
         sudo dpkg --add-architecture $arch
         sudo apt-get update -qq
-        sudo apt install -y --no-install-recommends ${native[@]} ${target[@]/%/:$arch} > /dev/null
+        sudo apt-get install -qq aptitude > /dev/null
+        sudo aptitude install -yR ${native[@]} ${target[@]/%/:$arch} > /dev/null
       }
 
+      sudo update-alternatives --set gcc /usr/bin/gcc-7
+
       case $ARCH in
       x86_64)
         install-deps amd64