From ae24fe69ed6f386240147ebbcecf4cf7696997ed Mon Sep 17 00:00:00 2001
From: Lauryn Menard <63245456+laurynmm@users.noreply.github.com>
Date: Fri, 29 Apr 2022 19:14:51 +0200
Subject: [PATCH] ci: Remove actions/cache@v2 steps from run due to failures.

Comments out the steps in 'Create cache directories' that use
`actions/cache@2` so that the CI and production build can pass
while Github support issue is processed.

See https://github.com/actions/cache/issues/794 for an upstream report.
---
 .github/workflows/production-suite.yml | 50 +++++++++++++-------------
 .github/workflows/zulip-ci.yml         | 37 +++++++++----------
 2 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/production-suite.yml b/.github/workflows/production-suite.yml
index a5e8d44de0..98931c7e4e 100644
--- a/.github/workflows/production-suite.yml
+++ b/.github/workflows/production-suite.yml
@@ -62,26 +62,27 @@ jobs:
           sudo mkdir -p "${dirs[@]}"
           sudo chown -R github "${dirs[@]}"
 
-      - name: Restore node_modules cache
-        uses: actions/cache@v2
-        with:
-          path: /srv/zulip-npm-cache
-          key: v1-yarn-deps-focal-${{ hashFiles('package.json') }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: v1-yarn-deps-focal
+      # TEMPORARY: due to CI failures.
+      # - name: Restore node_modules cache
+      #   uses: actions/cache@v2
+      #   with:
+      #     path: /srv/zulip-npm-cache
+      #     key: v1-yarn-deps-focal-${{ hashFiles('package.json') }}-${{ hashFiles('yarn.lock') }}
+      #     restore-keys: v1-yarn-deps-focal
 
-      - name: Restore python cache
-        uses: actions/cache@v2
-        with:
-          path: /srv/zulip-venv-cache
-          key: v1-venv-focal-${{ hashFiles('requirements/dev.txt') }}
-          restore-keys: v1-venv-focal
+      # - name: Restore python cache
+      #   uses: actions/cache@v2
+      #   with:
+      #     path: /srv/zulip-venv-cache
+      #     key: v1-venv-focal-${{ hashFiles('requirements/dev.txt') }}
+      #     restore-keys: v1-venv-focal
 
-      - name: Restore emoji cache
-        uses: actions/cache@v2
-        with:
-          path: /srv/zulip-emoji-cache
-          key: v1-emoji-focal-${{ 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-focal
+      # - name: Restore emoji cache
+      #   uses: actions/cache@v2
+      #   with:
+      #     path: /srv/zulip-emoji-cache
+      #     key: v1-emoji-focal-${{ 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-focal
 
       - name: Build production tarball
         run: ./tools/ci/production-build
@@ -154,12 +155,13 @@ jobs:
           sudo mkdir -p "${dirs[@]}"
           sudo chown -R github "${dirs[@]}"
 
-      - name: Restore node_modules cache
-        uses: actions/cache@v2
-        with:
-          path: /srv/zulip-npm-cache
-          key: v1-yarn-deps-${{ matrix.os }}-${{ hashFiles('/tmp/package.json') }}-${{ hashFiles('/tmp/yarn.lock') }}
-          restore-keys: v1-yarn-deps-${{ matrix.os }}
+      # TEMPORARY: due to CI failures.
+      # - name: Restore node_modules cache
+      #   uses: actions/cache@v2
+      #   with:
+      #     path: /srv/zulip-npm-cache
+      #     key: v1-yarn-deps-${{ matrix.os }}-${{ hashFiles('/tmp/package.json') }}-${{ hashFiles('/tmp/yarn.lock') }}
+      #     restore-keys: v1-yarn-deps-${{ matrix.os }}
 
       - name: Install production
         run: |
diff --git a/.github/workflows/zulip-ci.yml b/.github/workflows/zulip-ci.yml
index 57f4bec501..52312b9e93 100644
--- a/.github/workflows/zulip-ci.yml
+++ b/.github/workflows/zulip-ci.yml
@@ -52,26 +52,27 @@ jobs:
           sudo mkdir -p "${dirs[@]}"
           sudo chown -R github "${dirs[@]}"
 
-      - name: Restore node_modules cache
-        uses: actions/cache@v2
-        with:
-          path: /srv/zulip-npm-cache
-          key: v1-yarn-deps-${{ matrix.os }}-${{ hashFiles('package.json') }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: v1-yarn-deps-${{ matrix.os }}
+      # TEMPORARY: due to CI failures.
+      # - name: Restore node_modules cache
+      #   uses: actions/cache@v2
+      #   with:
+      #     path: /srv/zulip-npm-cache
+      #     key: v1-yarn-deps-${{ matrix.os }}-${{ hashFiles('package.json') }}-${{ hashFiles('yarn.lock') }}
+      #     restore-keys: v1-yarn-deps-${{ matrix.os }}
 
-      - name: Restore python cache
-        uses: actions/cache@v2
-        with:
-          path: /srv/zulip-venv-cache
-          key: v1-venv-${{ matrix.os }}-${{ hashFiles('requirements/dev.txt') }}
-          restore-keys: v1-venv-${{ matrix.os }}
+      # - name: Restore python cache
+      #   uses: actions/cache@v2
+      #   with:
+      #     path: /srv/zulip-venv-cache
+      #     key: v1-venv-${{ matrix.os }}-${{ hashFiles('requirements/dev.txt') }}
+      #     restore-keys: v1-venv-${{ matrix.os }}
 
-      - name: Restore emoji cache
-        uses: actions/cache@v2
-        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') }}
-          restore-keys: v1-emoji-${{ matrix.os }}
+      # - name: Restore emoji cache
+      #   uses: actions/cache@v2
+      #   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') }}
+      #     restore-keys: v1-emoji-${{ matrix.os }}
 
       - name: Install dependencies
         run: |