From 3daa182ee60f89ff300288f41424a63f397677e1 Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Tue, 12 Jan 2021 13:06:58 +0100 Subject: [PATCH] Fixed changed sequence of checkout/action The #13631 was also problematic because checkout/action sequence was left from the original sequence (but it needs to be reverted to work). This change fixes the sequence --- .../workflows/build-images-workflow-run.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-images-workflow-run.yml b/.github/workflows/build-images-workflow-run.yml index 29deda4aea984..bd107889795d8 100644 --- a/.github/workflows/build-images-workflow-run.yml +++ b/.github/workflows/build-images-workflow-run.yml @@ -431,6 +431,16 @@ jobs: else echo "::set-output name=proceed::true" fi + - name: > + Checkout "${{ needs.cancel-workflow-runs.outputs.targetBranch }}" branch to 'main-airflow' folder + to use ci/scripts from there. + uses: actions/checkout@v2 + with: + path: "main-airflow" + ref: "${{ needs.cancel-workflow-runs.outputs.targetBranch }}" + persist-credentials: false + submodules: recursive + if: steps.defaults.outputs.proceed == 'true' - name: Initiate GitHub Checks for Building image with status uses: ./main-airflow/.github/actions/checks-action id: build-image-check @@ -446,16 +456,6 @@ jobs: [Image Build](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}) for details" } if: steps.defaults.outputs.proceed == 'true' - - name: > - Checkout "${{ needs.cancel-workflow-runs.outputs.targetBranch }}" branch to 'main-airflow' folder - to use ci/scripts from there. - uses: actions/checkout@v2 - with: - path: "main-airflow" - ref: "${{ needs.cancel-workflow-runs.outputs.targetBranch }}" - persist-credentials: false - submodules: recursive - if: steps.defaults.outputs.proceed == 'true' - name: "Setup python" uses: actions/setup-python@v2 with: