From 070632fa72975839cf19c9206e0afef4f7244b6f Mon Sep 17 00:00:00 2001 From: Chris McDevitt Date: Wed, 14 Apr 2021 11:36:23 +0100 Subject: [PATCH 1/2] fix(ci): add -repo to repo cache names to not match with deps cache Is failing due to fallback to v1-jackdaw-* and matching with v1-jackdaw-deps --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f086746c..8615e8fd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,13 +3,13 @@ version: 2 references: repo_cache_key: &repo_cache_key - v1-jackdaw-{{ .Branch }}-{{ .Revision }} + v1-jackdaw-repo-{{ .Branch }}-{{ .Revision }} repo_cache_backup_1: &repo_cache_backup_1 - v1-jackdaw-{{ .Branch }} + v1-jackdaw-repo-{{ .Branch }} repo_cache_backup_2: &repo_cache_backup_2 - v1-jackdaw + v1-jackdaw-repo restore_repo: &restore_repo restore_cache: @@ -72,7 +72,7 @@ jobs: - *restore_repo - checkout - save_cache: - key: v1-jackdaw-{{ .Branch }}-{{ .Revision }} + key: v1-jackdaw-repo-{{ .Branch }}-{{ .Revision }} paths: - . checkout_tags: @@ -96,7 +96,7 @@ jobs: git fetch --force origin "refs/tags/${CIRCLE_TAG}:refs/tags/${CIRCLE_TAG}" - checkout - save_cache: - key: v1-jackdaw-{{ .Branch }}-{{ .Revision }} + key: v1-jackdaw-repo-{{ .Branch }}-{{ .Revision }} paths: - . deps: From 6d47fd5d78b74e316ef4baccbc92499f8c7c3d23 Mon Sep 17 00:00:00 2001 From: Chris McDevitt Date: Wed, 14 Apr 2021 11:54:53 +0100 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 227906b3..71af0e8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## Unreleased -## [0.7.9] - [2021-04-13] +## [0.7.10] - [2021-04-14] * Bump netty related packages to latest version (related to changes in `0.7.8` which fixes CVEs). ## [0.7.8] - [2021-03-01]