From 0a3d36968737ad70bf234b6cc438230911b14f9c Mon Sep 17 00:00:00 2001 From: Philip H <47042125+pheiduck@users.noreply.github.com> Date: Wed, 31 Jan 2024 20:04:22 +0100 Subject: CI: get rid of snap and speed up CI (#13938) Signed-off-by: Philip H <47042125+pheiduck@users.noreply.github.com> Signed-off-by: Christian Brabandt --- .github/workflows/ci.yml | 4 ++++ Filelist | 1 + ci/remove_snap.sh | 13 +++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 ci/remove_snap.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 726de4e51c..ebac88216b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,6 +90,10 @@ jobs: - run: sudo dpkg --add-architecture i386 if: matrix.architecture == 'i386' + - name: Uninstall snap + run: | + sudo bash ci/remove_snap.sh + - name: Install packages run: | PKGS=( \ diff --git a/Filelist b/Filelist index d4fbca342e..a3b66f11d8 100644 --- a/Filelist +++ b/Filelist @@ -20,6 +20,7 @@ SRC_ALL = \ ci/config.mk*.sed \ ci/if_ver*.vim \ ci/setup-xvfb.sh \ + ci/remove_snap.sh \ src/Make_all.mak \ src/README.md \ src/alloc.c \ diff --git a/ci/remove_snap.sh b/ci/remove_snap.sh new file mode 100644 index 0000000000..a812307d3b --- /dev/null +++ b/ci/remove_snap.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env sh +pushd /etc/apt/preferences.d/ +cat > nosnap.pref <