[airflow] branch main updated: Add "main" replacement for other places in build-image (#27382)

[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 262c2822fc Add "main" replacement for other places in build-image 
(#27382)
262c2822fc is described below

commit 262c2822fc94780ae994bdd25c8adf1478bd9cad
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sun Oct 30 18:43:36 2022 +0100

    Add "main" replacement for other places in build-image (#27382)
    
    This is follow up after #27378 - we had two more places where we
    also should use main version of actions.
---
 .github/workflows/build-images.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-images.yml 
b/.github/workflows/build-images.yml
index d46f7198fc..c44cf2c2e9 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -278,16 +278,18 @@ jobs:
           persist-credentials: false
           submodules: recursive
       - name: >
-          Override "scripts/ci" with the "main" branch
+          Override "scripts/ci", "dev" and "./github/actions" with the "main" 
branch
           so that the PR does not override it
         # We should not override those scripts which become part of the image 
as they will not be
         # changed in the image built - we should only override those that are 
executed to build
         # the image.
         run: |
           rm -rfv "scripts/ci"
-          rm -rfv "dev"
           mv -v "main-airflow/scripts/ci" "scripts"
+          rm -rfv "dev"
           mv -v "main-airflow/dev" "."
+          rm -rfv "./github/actions"
+          mv -v "main-airflow/.github/actions" "actions"
       - name: "Install Breeze"
         uses: ./.github/actions/breeze
       - name: "Regenerate dependencies in case they was modified manually so 
that we can build an image"
@@ -375,19 +377,22 @@ jobs:
           persist-credentials: false
           submodules: recursive
       - name: >
-          Override "scripts/ci" with the "main" branch
+          Override "scripts/ci", "dev" and "./github/actions" with the "main" 
branch
           so that the PR does not override it
         # We should not override those scripts which become part of the image 
as they will not be
         # changed in the image built - we should only override those that are 
executed to build
         # the image.
         run: |
           rm -rfv "scripts/ci"
-          rm -rfv "dev"
           mv -v "main-airflow/scripts/ci" "scripts"
+          rm -rfv "dev"
           mv -v "main-airflow/dev" "."
-
+          rm -rfv "./github/actions"
+          mv -v "main-airflow/.github/actions" "actions"
       - name: "Start ARM instance"
         run: ./scripts/ci/images/ci_start_arm_instance_and_connect_to_docker.sh
+      - name: "Install Breeze"
+        uses: ./.github/actions/breeze
       - name: >
           Build ARM CI images ${{ env.IMAGE_TAG_FOR_THE_BUILD }}
           ${{ needs.build-info.outputs.all-python-versions-list-as-string }}