[llvm] [libc++] Adjust the workflow file for building a Docker image (PR #116333)

[Louis Dionne via llvm-commits]

https://github.com/ldionne updated https://github.com/llvm/llvm-project/pull/116333

>From c24aad22210d97437f977516ce96fee66d35b471 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Fri, 15 Nov 2024 08:41:20 +0100
Subject: [PATCH 1/2] [libc++] Adjust the workflow file for building a Docker
 image

---
 .github/workflows/libcxx-build-containers.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/libcxx-build-containers.yml b/.github/workflows/libcxx-build-containers.yml
index e55a4f2a11b099..e9fcb565953d10 100644
--- a/.github/workflows/libcxx-build-containers.yml
+++ b/.github/workflows/libcxx-build-containers.yml
@@ -35,9 +35,9 @@ jobs:
 
     - name: Build the Linux builder image and the Android builder image
       working-directory: libcxx/utils/ci
-      run:
-        - docker compose build actions-builder
-        - docker compose build android-buildkite-builder
+      run: |
+        docker compose build actions-builder
+        docker compose build android-buildkite-builder
 
     - name: Log in to GitHub Container Registry
       uses: docker/login-action at v3
@@ -49,15 +49,15 @@ jobs:
     - name: Push the Linux builder image
       if: github.event_name == 'push'
       working-directory: libcxx/utils/ci
-      run:
-        - docker compose push actions-builder
+      run: |
+        docker compose push actions-builder
       env:
         TAG: libcxx-linux-builder:${{ github.sha }}
 
     - name: Push the Android builder image
       if: github.event_name == 'push'
       working-directory: libcxx/utils/ci
-      run:
-        - docker compose push android-buildkite-builder
+      run: |
+        docker compose push android-buildkite-builder
       env:
         TAG: libcxx-android-builder:${{ github.sha }}

>From 433999ea7f453f0517301b6ebcb32f56ad8751b7 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Fri, 15 Nov 2024 08:50:56 +0100
Subject: [PATCH 2/2] More tweaks

---
 .github/workflows/libcxx-build-containers.yml | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/libcxx-build-containers.yml b/.github/workflows/libcxx-build-containers.yml
index e9fcb565953d10..92ef6611055037 100644
--- a/.github/workflows/libcxx-build-containers.yml
+++ b/.github/workflows/libcxx-build-containers.yml
@@ -33,11 +33,13 @@ jobs:
     steps:
     - uses: actions/checkout at v4
 
-    - name: Build the Linux builder image and the Android builder image
+    - name: Build the Linux builder image
       working-directory: libcxx/utils/ci
-      run: |
-        docker compose build actions-builder
-        docker compose build android-buildkite-builder
+      run: docker compose build actions-builder
+
+    # - name: Build the Android builder image
+    #   working-directory: libcxx/utils/ci
+    #   run: docker compose build android-buildkite-builder
 
     - name: Log in to GitHub Container Registry
       uses: docker/login-action at v3
@@ -54,10 +56,10 @@ jobs:
       env:
         TAG: libcxx-linux-builder:${{ github.sha }}
 
-    - name: Push the Android builder image
-      if: github.event_name == 'push'
-      working-directory: libcxx/utils/ci
-      run: |
-        docker compose push android-buildkite-builder
-      env:
-        TAG: libcxx-android-builder:${{ github.sha }}
+    # - name: Push the Android builder image
+    #   if: github.event_name == 'push'
+    #   working-directory: libcxx/utils/ci
+    #   run: |
+    #     docker compose push android-buildkite-builder
+    #   env:
+    #     TAG: libcxx-android-builder:${{ github.sha }}