CIs: Replace cache fingerprints so cache is reusable between builds (fix save_cache)

This commit is contained in:
tlaurion 2020-06-07 17:00:24 -04:00 committed by Thierry Laurion
commit 7941dac328
No known key found for this signature in database
GPG Key ID: E7B4A71658E36A93
2 changed files with 3 additions and 3 deletions

View File

@ -12,7 +12,7 @@ jobs:
- checkout
- restore_cache:
key: heads-{{ .Branch }}{{ .Environment.CACHE_VERSION }}
key: heads-{{ .Environment.CIRCLE_USERNAME }}-{{ .Environment.CACHE_VERSION }}
- run:
name: git reset
@ -154,7 +154,7 @@ jobs:
path: build/qemu-coreboot
- save_cache:
key: heads-{{ .Branch }}{{ .Environment.CACHE_VERSION }}
key: heads-{{ .Environment.CIRCLE_USERNAME }}{{ .Environment.CACHE_VERSION }}
paths:
- packages
- crossgcc

View File

@ -14,7 +14,7 @@ build:
- packages
- crossgcc
- build
key: "$CI_COMMIT_REF_SLUG"
key: "heads-$GITLAB_USER_LOGIN"
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 cpio texinfo
- git fetch origin