From a15381b23d3f6b59180e83a94a5279feccbf79a2 Mon Sep 17 00:00:00 2001 From: Abubakar Abid Date: Tue, 8 Oct 2024 15:33:50 -0700 Subject: [PATCH] Revert "disable cache (#9237)" (#9596) This reverts commit 3817d82f095e3a137b3b5d242fa175089a3797cb. --- .github/actions/install-all-deps/action.yml | 21 +++++++++---------- .../actions/install-frontend-deps/action.yml | 15 +++++++------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.github/actions/install-all-deps/action.yml b/.github/actions/install-all-deps/action.yml index d4795ab722fa..9b60e434207c 100644 --- a/.github/actions/install-all-deps/action.yml +++ b/.github/actions/install-all-deps/action.yml @@ -54,20 +54,19 @@ runs: run: | python -m pip install --upgrade virtualenv python -m virtualenv venv - # - uses: actions/cache@v4 - # id: cache - # with: - # path: | - # venv/* - # client/python/venv - # restore-keys: | - # gradio-lib-${{inputs.python_version}}-${{inputs.os}}-latest-pip- - # key: "gradio-lib-${{inputs.python_version}}-${{inputs.os}}-latest-pip-${{ hashFiles('client/python/requirements.txt') }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('test/requirements.txt') }}-${{ hashFiles('client/python/test/requirements.txt') }}${{ inputs.test == 'true' && '-test' || ''}}" + - uses: actions/cache@v4 + id: cache + with: + path: | + venv/* + client/python/venv + restore-keys: | + gradio-lib-${{inputs.python_version}}-${{inputs.os}}-latest-pip- + key: "gradio-lib-${{inputs.python_version}}-${{inputs.os}}-latest-pip-${{ hashFiles('client/python/requirements.txt') }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('test/requirements.txt') }}-${{ hashFiles('client/python/test/requirements.txt') }}${{ inputs.test == 'true' && '-test' || ''}}" - name: Install ffmpeg uses: FedericoCarboni/setup-ffmpeg@583042d32dd1cabb8bd09df03bde06080da5c87c # @v2 - name: Install test dependencies - if: inputs.test == 'true' - # && steps.cache.outputs.cache-hit != 'true' + if: inputs.test == 'true' && steps.cache.outputs.cache-hit != 'true' shell: bash run: | . ${{ env.VENV_ACTIVATE }} diff --git a/.github/actions/install-frontend-deps/action.yml b/.github/actions/install-frontend-deps/action.yml index 9bd9144de14a..8f34ff33e916 100644 --- a/.github/actions/install-frontend-deps/action.yml +++ b/.github/actions/install-frontend-deps/action.yml @@ -12,12 +12,12 @@ inputs: runs: using: "composite" steps: - # - uses: actions/cache@v4 - # id: frontend-cache - # with: - # path: | - # gradio/templates/* - # key: gradio-lib-front-end-${{ hashFiles('js/**', 'client/js/**')}} + - uses: actions/cache@v4 + id: frontend-cache + with: + path: | + gradio/templates/* + key: gradio-lib-front-end-${{ hashFiles('js/**', 'client/js/**')}} - name: Install pnpm uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # @v4 with: @@ -34,8 +34,7 @@ runs: shell: bash run: pnpm css - name: Build frontend - if: inputs.skip_build == 'false' - # && steps.frontend-cache.outputs.cache-hit != 'true' + if: inputs.skip_build == 'false' && steps.frontend-cache.outputs.cache-hit != 'true' shell: bash run: pnpm build - name: generate types