This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v2-3-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 44994a79b7cd65fceadeffe58691bab09d57b37d Author: Jarek Potiuk <[email protected]> AuthorDate: Tue Jun 28 23:22:23 2022 +0200 Fix unnecessary check for ARM images (#24718) The ARM image build introduced in #24664 had problem with build image that was additionally checking for arm images which were moved out to a spearate step (cherry picked from commit 5321577aeef49a33d10efa42222df5524cc45c26) --- .github/workflows/build-images.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index 39c758a23d..e6bb57c40d 100644 --- a/.github/workflows/build-images.yml +++ b/.github/workflows/build-images.yml @@ -228,32 +228,18 @@ jobs: Build & Push AMD64 CI images ${{ env.IMAGE_TAG_FOR_THE_BUILD }} ${{ needs.build-info.outputs.allPythonVersionsListAsString }} run: breeze build-image --push-image --tag-as-latest --run-in-parallel - if: matrix.platform == 'linux/amd64' - env: - UPGRADE_TO_NEWER_DEPENDENCIES: ${{ needs.build-info.outputs.upgradeToNewerDependencies }} - DOCKER_CACHE: ${{ needs.build-info.outputs.cacheDirective }} - IMAGE_TAG: ${{ env.IMAGE_TAG_FOR_THE_BUILD }} - PYTHON_VERSIONS: ${{ needs.build-info.outputs.allPythonVersionsListAsString }} - - name: "Start ARM instance" - run: ./scripts/ci/images/ci_start_arm_instance_and_connect_to_docker.sh - if: matrix.platform == 'linux/arm64' - - name: > - Build ARM CI images ${{ env.IMAGE_TAG_FOR_THE_BUILD }} - ${{ needs.build-info.outputs.allPythonVersionsListAsString }} - run: breeze build-image --run-in-parallel - if: matrix.platform == 'linux/arm64' env: UPGRADE_TO_NEWER_DEPENDENCIES: ${{ needs.build-info.outputs.upgradeToNewerDependencies }} DOCKER_CACHE: ${{ needs.build-info.outputs.cacheDirective }} IMAGE_TAG: ${{ env.IMAGE_TAG_FOR_THE_BUILD }} PYTHON_VERSIONS: ${{ needs.build-info.outputs.allPythonVersionsListAsString }} - name: Push empty CI image ${{ env.PYTHON_MAJOR_MINOR_VERSION }}:${{ env.IMAGE_TAG_FOR_THE_BUILD }} - if: (failure() || cancelled()) && matrix.platform == 'linux/amd64' + if: failure() || cancelled() run: breeze build-image --push-image --empty-image --run-in-parallel env: IMAGE_TAG: ${{ env.IMAGE_TAG_FOR_THE_BUILD }} - name: "Candidates for pip resolver backtrack triggers" - if: (failure() || cancelled()) && matrix.platform == 'linux/amd64' + if: failure() || cancelled() run: > breeze find-newer-dependencies --max-age 1 --python "${{ needs.build-info.outputs.defaultPythonVersion }}"
