From 35d56ea5282bb2aeec4629c2c77f12bdbefb566a Mon Sep 17 00:00:00 2001 From: Vipul Date: Mon, 29 Aug 2022 23:07:10 +0530 Subject: [PATCH] CI: Remove multiple hashFiles instances in a single step. hashFiles supports passing multiple filenames, and using this feature results in much cleaner keys. Fixes: #22796 --- .github/workflows/zulip-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/zulip-ci.yml b/.github/workflows/zulip-ci.yml index 7f031a2a77..fe3c24aa13 100644 --- a/.github/workflows/zulip-ci.yml +++ b/.github/workflows/zulip-ci.yml @@ -69,7 +69,7 @@ jobs: uses: actions/cache@v3 with: path: /srv/zulip-npm-cache - key: v1-yarn-deps-${{ matrix.os }}-${{ hashFiles('package.json') }}-${{ hashFiles('yarn.lock') }} + key: v1-yarn-deps-${{ matrix.os }}-${{ hashFiles('package.json', 'yarn.lock') }} restore-keys: v1-yarn-deps-${{ matrix.os }} - name: Restore python cache @@ -83,7 +83,7 @@ jobs: uses: actions/cache@v3 with: path: /srv/zulip-emoji-cache - key: v1-emoji-${{ matrix.os }}-${{ 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-${{ matrix.os }}-${{ hashFiles('tools/setup/emoji/emoji_map.json', 'tools/setup/emoji/build_emoji', 'tools/setup/emoji/emoji_setup_utils.py', 'tools/setup/emoji/emoji_names.py', 'package.json') }} restore-keys: v1-emoji-${{ matrix.os }} - name: Install dependencies