summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip H <47042125+pheiduck@users.noreply.github.com>2024-01-31 20:04:22 +0100
committerGitHub <noreply@github.com>2024-01-31 20:04:22 +0100
commit0a3d36968737ad70bf234b6cc438230911b14f9c (patch)
treea7e8607d8b8c98584760686d056f7e8cd073fc51
parent28db30ddb1ea458dd1826babe479ec2bf54b1ed6 (diff)
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 <cb@256bit.org>
-rw-r--r--.github/workflows/ci.yml4
-rw-r--r--Filelist1
-rw-r--r--ci/remove_snap.sh13
3 files changed, 18 insertions, 0 deletions
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 <<EOF
+# To prevent repository packages from triggering the installation of snap,
+# this file forbids snapd from being installed by APT.
+
+Package: snapd
+Pin: release a=*
+Pin-Priority: -10
+EOF
+popd
+snap remove --purge $(snap list | awk '!/^Name|^core/ {print $1}')
+apt-get purge -y snapd