Skip to content

Conversation

ldionne
Copy link
Member

@ldionne ldionne commented Nov 15, 2024

No description provided.

@ldionne ldionne marked this pull request as ready for review November 15, 2024 07:58
@ldionne ldionne merged commit a809405 into llvm:main Nov 15, 2024
8 of 9 checks passed
@ldionne ldionne deleted the review/adjust-libcxx-runner-github-action branch November 15, 2024 07:58
@llvmbot llvmbot added libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. github:workflow labels Nov 16, 2024
@llvmbot
Copy link
Member

llvmbot commented Nov 16, 2024

@llvm/pr-subscribers-github-workflow

Author: Louis Dionne (ldionne)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/116333.diff

1 Files Affected:

  • (modified) .github/workflows/libcxx-build-containers.yml (+15-13)
diff --git a/.github/workflows/libcxx-build-containers.yml b/.github/workflows/libcxx-build-containers.yml
index e55a4f2a11b099..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@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@v3
@@ -49,15 +51,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
-      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 }}

@llvmbot
Copy link
Member

llvmbot commented Nov 16, 2024

@llvm/pr-subscribers-libcxx

Author: Louis Dionne (ldionne)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/116333.diff

1 Files Affected:

  • (modified) .github/workflows/libcxx-build-containers.yml (+15-13)
diff --git a/.github/workflows/libcxx-build-containers.yml b/.github/workflows/libcxx-build-containers.yml
index e55a4f2a11b099..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@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@v3
@@ -49,15 +51,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
-      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 }}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

github:workflow libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants