mirror of https://github.com/zulip/zulip.git
ci: Cache with the OS name, not the job name.
The job name is just the constant `production_build`. Renaming it to have the OS in the key ensures that it is not shared across OS'es (for instance between `4.x` and `main`, which are now bionic and buster, respectively), and also allows it to share caches with the install step, which uses the OS name in that place.
This commit is contained in:
parent
669010494e
commit
2fc156e556
|
@ -66,22 +66,22 @@ jobs:
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
path: /srv/zulip-npm-cache
|
path: /srv/zulip-npm-cache
|
||||||
key: v1-yarn-deps-${{ github.job }}-${{ hashFiles('package.json') }}-${{ hashFiles('yarn.lock') }}
|
key: v1-yarn-deps-buster-${{ hashFiles('package.json') }}-${{ hashFiles('yarn.lock') }}
|
||||||
restore-keys: v1-yarn-deps-${{ github.job }}
|
restore-keys: v1-yarn-deps-buster
|
||||||
|
|
||||||
- name: Restore python cache
|
- name: Restore python cache
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
path: /srv/zulip-venv-cache
|
path: /srv/zulip-venv-cache
|
||||||
key: v1-venv-${{ github.job }}-${{ hashFiles('requirements/dev.txt') }}
|
key: v1-venv-buster-${{ hashFiles('requirements/dev.txt') }}
|
||||||
restore-keys: v1-venv-${{ github.job }}
|
restore-keys: v1-venv-buster
|
||||||
|
|
||||||
- name: Restore emoji cache
|
- name: Restore emoji cache
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
path: /srv/zulip-emoji-cache
|
path: /srv/zulip-emoji-cache
|
||||||
key: v1-emoji-${{ github.job }}-${{ hashFiles('tools/setup/emoji/emoji_map.json') }}-${{ hashFiles('tools/setup/emoji/build_emoji') }}-${{ hashFiles('tools/setup/emoji/emoji_setup_utils.py') }}-${{ hashFiles('tools/setup/emoji/emoji_names.py') }}-${{ hashFiles('package.json') }}
|
key: v1-emoji-buster-${{ hashFiles('tools/setup/emoji/emoji_map.json') }}-${{ hashFiles('tools/setup/emoji/build_emoji') }}-${{ hashFiles('tools/setup/emoji/emoji_setup_utils.py') }}-${{ hashFiles('tools/setup/emoji/emoji_names.py') }}-${{ hashFiles('package.json') }}
|
||||||
restore-keys: v1-emoji-${{ github.job }}
|
restore-keys: v1-emoji-buster
|
||||||
|
|
||||||
- name: Build production tarball
|
- name: Build production tarball
|
||||||
run: ./tools/ci/production-build
|
run: ./tools/ci/production-build
|
||||||
|
|
Loading…
Reference in New Issue