From b63b3b5f682c616be171e80adb88d1bbbdebf94b Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sat, 28 Mar 2020 12:54:06 +0000 Subject: [PATCH] Fix CI Debian Stretch build (#678) The cmake package in debian-stretch has recently been updated: https://packages.debian.org/stretch-backports/cmake This new version of cmake depends on a version of libarchive13 that is only available in stretch-backports-sloppy. To allow libarchive13 to be installed from stretch-backports-sloppy I've added the debian-stretch-sloppy "suite" and changed -t stretch-backports to -t 'stretch-backports*'. --- .circleci/config.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a63c2aa07..8e33959b4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,9 +6,10 @@ jobs: working_directory: ~/repo steps: - checkout + - run: echo deb http://deb.debian.org/debian stretch-backports-sloppy main >> /etc/apt/sources.list.d/debian-backports.list - run: apt-get update -y - run: apt-get install -y g++ libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev git - - run: apt-get install -y -t stretch-backports cmake libsodium-dev + - run: apt-get install -y -t 'stretch-backports*' cmake libsodium-dev - run: cd build && cmake .. -DNIGHTLY_BUILD=ON - run: cd build && cmake --build . -j $(nproc) - store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x86_64} @@ -30,9 +31,10 @@ jobs: working_directory: ~/repo steps: - checkout + - run: echo deb http://deb.debian.org/debian stretch-backports-sloppy main >> /etc/apt/sources.list.d/debian-backports.list - run: apt-get update -y - run: apt-get install -y g++ libsdl-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev git - - run: apt-get install -y -t stretch-backports cmake libsodium-dev + - run: apt-get install -y -t 'stretch-backports*' cmake libsodium-dev - run: cd build && cmake .. -DNIGHTLY_BUILD=ON -DUSE_SDL1=ON - run: cd build && cmake --build . -j $(nproc) - store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x86_64_sdl1} @@ -42,10 +44,11 @@ jobs: working_directory: ~/repo steps: - checkout + - run: echo deb http://deb.debian.org/debian stretch-backports-sloppy main >> /etc/apt/sources.list.d/debian-backports.list - run: dpkg --add-architecture i386 - run: apt-get update -y - run: apt-get install -y g++-multilib libsdl2-dev:i386 libsdl2-mixer-dev:i386 libsdl2-ttf-dev:i386 libsodium-dev git - - run: apt-get install -y -t stretch-backports cmake libsodium-dev:i386 + - run: apt-get install -y -t 'stretch-backports*' cmake libsodium-dev:i386 - run: cd build && cmake -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/32bit.cmake .. - run: cd build && cmake --build . -j $(nproc) - store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x86} @@ -77,7 +80,8 @@ jobs: steps: - checkout - run: echo deb http://deb.debian.org/debian stretch-backports main > /etc/apt/sources.list.d/debian-backports.list - - run: apt-get update && apt-get install -y -t stretch-backports cmake + - run: echo deb http://deb.debian.org/debian stretch-backports-sloppy main >> /etc/apt/sources.list.d/debian-backports.list + - run: apt-get update && apt-get install -y -t 'stretch-backports*' cmake - run: dkp-pacman -Syu --noconfirm # Install cmake files (https://github.com/devkitPro/docker/issues/3) - run: dkp-pacman -S --needed --noconfirm --quiet devkitpro-pkgbuild-helpers