(airflow) branch main updated: Fix wrong & push condition on building CI image (#38224)

[potiuk]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new ea6087834e Fix wrong & push condition on building CI image (#38224)
ea6087834e is described below

commit ea6087834e18ce5d8df4d608931a7933dff64177
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sun Mar 17 16:55:18 2024 +0100

    Fix wrong & push condition on building CI image (#38224)
---
 .github/workflows/ci-image-build.yml | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci-image-build.yml 
b/.github/workflows/ci-image-build.yml
index e8b54a083c..1b90e010fc 100644
--- a/.github/workflows/ci-image-build.yml
+++ b/.github/workflows/ci-image-build.yml
@@ -130,21 +130,9 @@ ${{ inputs.do-build == 'true' && inputs.image-tag || '' }}"
       - name: Login to ghcr.io
         run: echo "${{ env.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ 
github.actor }} --password-stdin
         if: inputs.do-build == 'true'
-      - name: "Build & Push ${{ inputs.platform }}:${{ inputs.image-tag }} ${{ 
matrix.python-version }}"
-        shell: bash
-        run: >
-          breeze ci-image build --push --tag-as-latest --image-tag "${{ 
inputs.image-tag }}"
-          --python "${{ matrix.python-version }}"
-          --platform "linux/${{ inputs.platform }}"
-        env:
-          DOCKER_CACHE: ${{ inputs.cache-directive }}
-          INSTALL_MYSQL_CLIENT_TYPE: ${{ inputs.install-mysql-client-type }}
-          UPGRADE_TO_NEWER_DEPENDENCIES: ${{ 
inputs.upgrade-to-newer-dependencies }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          USE_UV: ${{ inputs.use-uv }}
-          BUILDER: ${{ inputs.platform == 'amd64' && 'default' || 
'airflow_cache' }}
-        if: inputs.do-build == 'true'
-      - name: "Build ${{ inputs.platform }}:${{ inputs.image-tag }} ${{ 
matrix.python-version }}"
+      - name: >
+          Build ${{ inputs.push-image == 'true' && ' & push ' || '' }}
+          ${{ inputs.platform }}:${{ matrix.python-version }}:${{ 
inputs.image-tag }}
         shell: bash
         run: >
           breeze ci-image build --tag-as-latest --image-tag "${{ 
inputs.image-tag }}"
@@ -157,6 +145,7 @@ ${{ inputs.do-build == 'true' && inputs.image-tag || '' }}"
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           USE_UV: ${{ inputs.use-uv }}
           BUILDER: ${{ inputs.platform == 'amd64' && 'default' || 
'airflow_cache' }}
+          PUSH: ${{ inputs.push-image }}
         if: inputs.do-build == 'true'
       - name: "Stop ARM instance"
         run: ./scripts/ci/images/ci_stop_arm_instance.sh