Skip to content

Commit

Permalink
Add submodules in added workflow job (apache#13631)
Browse files Browse the repository at this point in the history
The most recent submodule change for actions apache#13514 was done in
parallel to Optimising worklfows in apache#13562 and the job added in
the apache#13562 still uses non-submodule version of check action.

Also few checkout steps missed:

'submodules: recursive' input

This PR fixes that and all 3rd-party actions now are used
from submodule.

(cherry picked from commit eb40eea)
(cherry picked from commit c8895bd)
  • Loading branch information
potiuk authored and kaxil committed Apr 23, 2021
1 parent 026086b commit fe2b0af
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/build-images-workflow-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ jobs:
uses: actions/checkout@v2
with:
persist-credentials: false
submodules: recursive
- name: >
Event: ${{ needs.cancel-workflow-runs.outputs.sourceEvent }}
Repo: ${{ needs.cancel-workflow-runs.outputs.sourceHeadRepo }}
Expand All @@ -223,12 +224,14 @@ jobs:
ref: ${{ needs.cancel-workflow-runs.outputs.targetCommitSha }}
fetch-depth: 2
persist-credentials: false
submodules: recursive
if: needs.cancel-workflow-runs.outputs.sourceEvent == 'pull_request'
# checkout the master version again, to use the right script in master workflow
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
uses: actions/checkout@v2
with:
persist-credentials: false
submodules: recursive
- name: Selective checks
id: selective-checks
env:
Expand Down Expand Up @@ -280,6 +283,7 @@ jobs:
with:
ref: ${{ needs.cancel-workflow-runs.outputs.targetCommitSha }}
persist-credentials: false
submodules: recursive
- name: "Retrieve DEFAULTS from the _initialization.sh"
# We cannot "source" the script here because that would be a security problem (we cannot run
# any code that comes from the sources coming from the PR. Therefore we extract the
Expand Down Expand Up @@ -352,7 +356,7 @@ jobs:
run: ./scripts/ci/images/ci_push_ci_images.sh
if: steps.defaults.outputs.proceed == 'true'
- name: Update GitHub Checks for Building image with status
uses: apache/airflow-checks-action@9f02872da71b6f558c6a6f190f925dde5e4d8798 # v1.1.0
uses: ./main-airflow/.github/actions/checks-action
if: always() && steps.defaults.outputs.proceed == 'true'
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -404,6 +408,7 @@ jobs:
with:
ref: ${{ needs.cancel-workflow-runs.outputs.targetCommitSha }}
persist-credentials: false
submodules: recursive
- name: "Retrieve DEFAULTS from the _initialization.sh"
# We cannot "source" the script here because that would be a security problem (we cannot run
# any code that comes from the sources coming from the PR. Therefore we extract the
Expand All @@ -425,8 +430,8 @@ jobs:
else
echo "::set-output name=proceed::true"
fi
- name: Initiate GitHub Checks for Building image
uses: apache/airflow-checks-action@9f02872da71b6f558c6a6f190f925dde5e4d8798 # v1.1.0
- name: Initiate GitHub Checks for Building image with status
uses: ./main-airflow/.github/actions/checks-action
id: build-image-check
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -448,6 +453,7 @@ jobs:
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
Expand Down

0 comments on commit fe2b0af

Please sign in to comment.