diff options
| author | funjoker <funjoker109@gmail.com> | 2020-04-04 14:58:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-04 14:58:00 +0200 |
| commit | 1794338532be2e76c0d39c81f94788b8269e602f (patch) | |
| tree | 2b06f1e5a9b502deb77dbed5104b8f64a583e87d | |
| parent | 1df52da0b052654a9b42339fdd22028bfdbf9fc0 (diff) | |
CI/Circle CI: Prevent conflict with diff branches (#24388)
| -rw-r--r-- | .circleci/config.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 2966dbbaffc..c8c4e0b792c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,9 +56,9 @@ jobs: /scripts/checkout.sh - restore_cache: keys: - - nopch-{{ .Branch }}-{{ .Revision }} - - nopch-{{ .Branch }} - - nopch + - 3.3.5-nopch-{{ .Branch }}-{{ .Revision }} + - 3.3.5-nopch-{{ .Branch }} + - 3.3.5-nopch - run: name: Setup command: | @@ -85,7 +85,7 @@ jobs: ./authserver --version ./worldserver --version - save_cache: - key: nopch-{{ .Branch }}-{{ .Revision }} + key: 3.3.5-nopch-{{ .Branch }}-{{ .Revision }} paths: - /home/circleci/.ccache workflows: |