Correct cache path and version it

szszszsz · May 20, 2020 · c3819ff · c3819ff
1 parent 3505313
commit c3819ff
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ image: fedora:30
 variables:
   DOCKER_DRIVER: overlay2
   V: "1"
+  CACHE_VERSION: "1"
 
 stages:
   - build
@@ -12,11 +13,14 @@ build:
   retry: 2
   cache:
     paths:
-      - ./
-    key: "$CI_COMMIT_REF_SLUG"
+      - packages
+      - crossgcc
+      - build
+    key: "$CI_COMMIT_REF_SLUG-$CACHE_VERSION"
   script:
     - dnf install -y @development-tools gcc-c++ gcc-gnat zlib-devel perl-Digest-MD5 perl-Digest-SHA uuid-devel pcsc-tools ncurses-devel lbzip2 libuuid-devel lzma elfutils-libelf-devel bc bzip2 bison flex git gnupg iasl m4 nasm patch python wget libusb-devel cmake automake pv bsdiff autoconf libtool expat-devel boost-devel libaio-devel cpio texinfo diceware
-    - git clone https://gitlab.com/szszszsz/heads.git && rm .git -rf && mv heads/.git . && rm heads -rf
+# below should not be needed anymore once the cache paths are corrected # TODO remove
+#    - git clone https://gitlab.com/szszszsz/heads.git && rm .git -rf && mv heads/.git . && rm heads -rf
     - git fetch origin
     - git reset --hard origin/$CI_COMMIT_REF_NAME
     - rm -rf build/libremkey-hotp-verification* -v