From 17d3da477770313a16a4f29ecae8476613ad3277 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 23 Jan 2021 21:40:04 +0000 Subject: Revert "ci: cache packages" This reverts commit e348ba38814c9cc7c1c9892d0451096234dc39ab. With the above commit we started caching the downloaded packages. Based on some testing and, it saves ~30s in the "step_script" stage while adding 18s for "Restoring/Saving cache". A net saving of ~10s. With earlier commit, we no longer use an ancient image which also pulls base-devel - thus the packages we have to download is minimal. Now comparing the uncached "step_script", vs the cached one - it is slowed by 2-3 seconds (1:01 -> 1:03), while we eliminate the 18s (and growing) caching. Tl:Dr: With up-to date image, package caching in not worth it - be that time, disk or network wise. Signed-off-by: Emil Velikov Signed-off-by: Allan McRae --- .gitlab-ci.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1fadaad0..507e1332 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,14 +1,6 @@ variables: MAKEFLAGS: "-j10" VERBOSE: 1 - PACMAN_OPTS: --needed --noconfirm --cachedir .pkg-cache - PACTEST_OPTS: --review --editor=../build-aux/cat-test-file - -cache: - key: pkgs-v1 - paths: - # For some reason Gitlab CI only supports storing cache/artifacts in a path relative to the build directory - - .pkg-cache default: after_script: @@ -18,7 +10,7 @@ default: image: archlinux:base-devel before_script: - > - pacman -Syu $PACMAN_OPTS + pacman -Syu --needed --noconfirm git gpgme libarchive curl python @@ -42,14 +34,14 @@ arch-debug: arch-docs: extends: .arch-test script: - - pacman -Syu $PACMAN_OPTS asciidoc + - pacman -Syu --needed --noconfirm asciidoc - meson -Ddoc=enabled build - ninja -C build arch-clang: extends: .arch-test script: - - pacman -Syu $PACMAN_OPTS clang + - pacman -Syu --needed --noconfirm clang - CC=clang meson build - ninja -C build - fakechroot meson test -C build @@ -92,7 +84,6 @@ arch-no-nls: debian: image: debian:bullseye - cache: {} before_script: - apt update - > @@ -108,7 +99,6 @@ debian: fedora: image: fedora - cache: {} before_script: - > dnf -y install -- cgit v1.2.3-70-g09d2