[gegl] ci: Do not cache pacman packages



commit fe20271e9e7335cdcdf8afc9dfdb3583412fe580
Author: Jan Vesely <jano vesely gmail com>
Date:   Tue Jun 2 14:28:52 2020 -0400

    ci: Do not cache pacman packages
    
    This only makes sense to do with local caches. Recompressing and
    reuploading downloaded packages does not help.
    Signed-off-by: Jan Vesely <jano vesely gmail com>

 .gitlab-ci.yml | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 303e41866..bcc04e4f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,6 @@ variables:
 cache:
   key: ${CI_JOB_NAME}
   paths:
-  - _pacman_cache
   - .ccache
 
 image: $CI_REGISTRY_IMAGE:ci-latest
@@ -28,20 +27,11 @@ build-image:
     - mkdir -p /kaniko/.docker
     - echo 
"{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" 
/kaniko/.docker/config.json
     - echo "FROM archlinux/base:latest" > Dockerfile
-    - echo "RUN pacman -Syu --noconfirm --needed git base-devel ccache meson lcms2 gobject-introspection 
pacman-contrib vala && pacman -Scc --noconfirm " >> Dockerfile
+    - echo "RUN pacman -Syu --noconfirm --needed git base-devel ccache meson lcms2 gobject-introspection 
vala && pacman -Scc --noconfirm " >> Dockerfile
 
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$CI_REGISTRY_IMAGE:ci-latest --cache=true --cache-ttl=120h
 
-.pacman-mgr:
-  variables:
-    PACMAN_CACHE: $CI_PROJECT_DIR/_pacman_cache
-  after_script:
-    # Remove all cached packages but the latest version
-    - pacman -S --noconfirm --needed --cachedir $PACMAN_CACHE pacman-contrib
-    - paccache -r -k1 --cachedir $PACMAN_CACHE
-
 .babl-base:
-  extends: .pacman-mgr
   stage: dependencies
   artifacts:
     paths:
@@ -50,7 +40,7 @@ build-image:
     GIT_DEPTH: "5"
     CCACHE_MAXSIZE: "32Mi"
   before_script:
-    - pacman -Syu --noconfirm --needed --cachedir $PACMAN_CACHE git base-devel ccache meson lcms2 
gobject-introspection vala
+    - pacman -Syu --noconfirm --needed git base-devel ccache meson lcms2 gobject-introspection vala
     - git clone --depth=$GIT_DEPTH https://gitlab.gnome.org/GNOME/babl.git _babl
     - cd _babl
     - ccache -z
@@ -81,12 +71,11 @@ babl-min:
 
 
 .gegl-deps:
-  extends: .pacman-mgr
   artifacts:
     paths:
     - _build/meson-logs/testlog.txt
   before_script:
-    - pacman -Syu --noconfirm --needed --cachedir $PACMAN_CACHE
+    - pacman -Syu --noconfirm --needed
         base-devel ccache meson
         ffmpeg
         gobject-introspection


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]