From e983c1c80e15681e081183591f40aba21d2e89d0 Mon Sep 17 00:00:00 2001 From: pngwn Date: Thu, 1 Feb 2024 13:15:15 +0000 Subject: [PATCH] Fix ci cache (#7261) * fix * fix * fix * format tweaks * add changeset * tweaks * tweaks * tweaks * tweaks --------- Co-authored-by: gradio-pr-bot --- .github/workflows/deploy+test-visual.yml | 2 +- .github/workflows/deploy-spaces.yml | 3 ++- .github/workflows/deploy-website.yml | 3 ++- .github/workflows/test-functional.yml | 3 ++- .github/workflows/test-hygiene.yml | 2 +- .github/workflows/test-python.yml | 13 +++---------- .github/workflows/tests-js.yml | 3 ++- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.github/workflows/deploy+test-visual.yml b/.github/workflows/deploy+test-visual.yml index 4066d1b97a..94631e687a 100644 --- a/.github/workflows/deploy+test-visual.yml +++ b/.github/workflows/deploy+test-visual.yml @@ -63,7 +63,7 @@ jobs: with: fetch-depth: 0 ref: ${{ needs.changes.outputs.sha }} - repository: ${{ needs.changes.outputs.source_repo }} + repository: ${{ needs.changes.outputs.mergeable == 'true' && github.repository || needs.changes.outputs.source_repo }} - name: install dependencies uses: "gradio-app/gradio/.github/actions/install-all-deps@main" with: diff --git a/.github/workflows/deploy-spaces.yml b/.github/workflows/deploy-spaces.yml index f00b4b3a2f..8774519133 100644 --- a/.github/workflows/deploy-spaces.yml +++ b/.github/workflows/deploy-spaces.yml @@ -23,6 +23,7 @@ jobs: source_branch: ${{ steps.changes.outputs.source_branch }} source_repo: ${{ steps.changes.outputs.source_repo }} merge_sha: ${{ steps.changes.outputs.merge_sha }} + mergeable: ${{ steps.changes.outputs.mergeable }} steps: - uses: actions/checkout@v3 - uses: "gradio-app/gradio/.github/actions/changes@main" @@ -55,7 +56,7 @@ jobs: - uses: actions/checkout@v3 with: ref: ${{ needs.changes.outputs.merge_sha }} - repository: ${{ needs.changes.outputs.source_repo }} + repository: ${{ needs.changes.outputs.mergeable == 'true' && github.repository || needs.changes.outputs.source_repo }} - name: Install Python uses: actions/setup-python@v5 with: diff --git a/.github/workflows/deploy-website.yml b/.github/workflows/deploy-website.yml index c53aff2478..852cd1f3c0 100644 --- a/.github/workflows/deploy-website.yml +++ b/.github/workflows/deploy-website.yml @@ -30,6 +30,7 @@ jobs: source_branch: ${{ steps.changes.outputs.source_branch }} source_repo: ${{ steps.changes.outputs.source_repo }} found_pr: ${{ steps.changes.outputs.found_pr }} + mergeable: ${{ steps.changes.outputs.mergeable }} steps: - uses: actions/checkout@v3 - uses: "gradio-app/gradio/.github/actions/changes@main" @@ -61,7 +62,7 @@ jobs: - uses: actions/checkout@v3 with: ref: ${{ needs.changes.outputs.merge_sha }} - repository: ${{ needs.changes.outputs.source_repo }} + repository: ${{ needs.changes.outputs.mergeable == 'true' && github.repository || needs.changes.outputs.source_repo }} - name: install dependencies uses: "gradio-app/gradio/.github/actions/install-all-deps@main" with: diff --git a/.github/workflows/test-functional.yml b/.github/workflows/test-functional.yml index c2138bae99..19224b098f 100644 --- a/.github/workflows/test-functional.yml +++ b/.github/workflows/test-functional.yml @@ -24,6 +24,7 @@ jobs: pr_number: ${{ steps.changes.outputs.pr_number }} source_branch: ${{ steps.changes.outputs.source_branch }} source_repo: ${{ steps.changes.outputs.source_repo }} + mergeable: ${{ steps.changes.outputs.mergeable }} steps: - uses: actions/checkout@v3 - uses: "gradio-app/gradio/.github/actions/changes@main" @@ -45,7 +46,7 @@ jobs: - uses: actions/checkout@v3 with: ref: ${{ needs.changes.outputs.merge_sha }} - repository: ${{ needs.changes.outputs.source_repo }} + repository: ${{ needs.changes.outputs.mergeable == 'true' && github.repository || needs.changes.outputs.source_repo }} - name: install dependencies id: install_deps uses: "gradio-app/gradio/.github/actions/install-all-deps@main" diff --git a/.github/workflows/test-hygiene.yml b/.github/workflows/test-hygiene.yml index 830d8a2a29..868cc3b462 100644 --- a/.github/workflows/test-hygiene.yml +++ b/.github/workflows/test-hygiene.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/checkout@v3 with: ref: ${{ needs.changes.outputs.merge_sha }} - repository: ${{ needs.changes.outputs.source_repo }} + repository: ${{ needs.changes.outputs.mergeable == 'true' && github.repository || needs.changes.outputs.source_repo }} - name: Generate Notebooks run: | pip install nbformat && cd demo && python generate_notebooks.py diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml index 56eef1e0c1..338cd82cd2 100644 --- a/.github/workflows/test-python.yml +++ b/.github/workflows/test-python.yml @@ -30,6 +30,7 @@ jobs: source_repo: ${{ steps.changes.outputs.source_repo }} merge_sha: ${{ steps.changes.outputs.merge_sha }} labels: ${{ steps.changes.outputs.labels }} + mergeable: ${{ steps.changes.outputs.mergeable }} steps: - uses: actions/checkout@v3 - uses: "gradio-app/gradio/.github/actions/changes@main" @@ -41,12 +42,7 @@ jobs: - name: echo github context if: always() run: echo "${{ github.event.workflow_run.head_repository.full_name }}-${{ github.event.workflow_run.head_branch }}-${{ github.workflow_ref }}" - - name: echo outputs - if: always() - run: echo "${{ toJson(steps.changes.outputs) }}" - - name: echo github context as json - if: always() - run: echo "${{ toJson(github) }}" + test-python: needs: [changes] @@ -62,13 +58,10 @@ jobs: runs-on: ${{ matrix.os }} continue-on-error: true steps: - - name: log needs changes - if: always() - run: echo ${{ toJson(needs.changes.outputs) }} - uses: actions/checkout@v3 with: ref: ${{ needs.changes.outputs.merge_sha }} - repository: ${{ needs.changes.outputs.source_repo }} + repository: ${{ needs.changes.outputs.mergeable == 'true' && github.repository || needs.changes.outputs.source_repo }} - name: install dependencies id: install_deps uses: "gradio-app/gradio/.github/actions/install-all-deps@main" diff --git a/.github/workflows/tests-js.yml b/.github/workflows/tests-js.yml index 22fc482673..8359c24cee 100644 --- a/.github/workflows/tests-js.yml +++ b/.github/workflows/tests-js.yml @@ -31,6 +31,7 @@ jobs: pr_number: ${{ steps.changes.outputs.pr_number }} source_branch: ${{ steps.changes.outputs.source_branch }} source_repo: ${{ steps.changes.outputs.source_repo }} + mergeable: ${{ steps.changes.outputs.mergeable }} steps: - uses: actions/checkout@v3 - uses: "gradio-app/gradio/.github/actions/changes@main" @@ -51,7 +52,7 @@ jobs: - uses: actions/checkout@v3 with: ref: ${{ needs.changes.outputs.merge_sha }} - repository: ${{ needs.changes.outputs.source_repo }} + repository: ${{ needs.changes.outputs.mergeable == 'true' && github.repository || needs.changes.outputs.source_repo }} - name: install dependencies uses: "gradio-app/gradio/.github/actions/install-frontend-deps@main" with: