[libcxx-commits] [libcxx] [llvm] [libc++] Adjust the docker-compose file for libc++ action builders (PR #116366)

Louis Dionne via libcxx-commits libcxx-commits at lists.llvm.org
Fri Nov 15 02:20:41 PST 2024


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

>From 14a9878d3573bb1cb64e444a16bd747f87837bb7 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Fri, 15 Nov 2024 10:54:26 +0100
Subject: [PATCH 1/5] WIP

---
 .github/workflows/libcxx-build-containers.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/libcxx-build-containers.yml b/.github/workflows/libcxx-build-containers.yml
index 92b2e3056da9ac..0e79b00824ac03 100644
--- a/.github/workflows/libcxx-build-containers.yml
+++ b/.github/workflows/libcxx-build-containers.yml
@@ -36,10 +36,14 @@ jobs:
     - name: Build the Linux builder image
       working-directory: libcxx/utils/ci
       run: docker compose build actions-builder
+      env:
+        TAG: ${{ github.sha }}
 
     # - name: Build the Android builder image
     #   working-directory: libcxx/utils/ci
     #   run: docker compose build android-buildkite-builder
+    #   env:
+    #     TAG: ${{ github.sha }}
 
     - name: Log in to GitHub Container Registry
       uses: docker/login-action at v3
@@ -49,7 +53,7 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Push the Linux builder image
-      if: github.event_name == 'push'
+      # if: github.event_name == 'push'
       working-directory: libcxx/utils/ci
       run: |
         docker compose push actions-builder

>From df0c1b0273a67a9600acdd204442fef5242f7713 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Fri, 15 Nov 2024 11:04:27 +0100
Subject: [PATCH 2/5] Add permissions to write packages

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

diff --git a/.github/workflows/libcxx-build-containers.yml b/.github/workflows/libcxx-build-containers.yml
index 0e79b00824ac03..7d98a4cabd2ea1 100644
--- a/.github/workflows/libcxx-build-containers.yml
+++ b/.github/workflows/libcxx-build-containers.yml
@@ -29,6 +29,8 @@ jobs:
   build-and-push:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'llvm'
+    permissions:
+      packages: write
 
     steps:
     - uses: actions/checkout at v4

>From fa15e67058be37ae1e2a315c766020c6974a75a5 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Fri, 15 Nov 2024 11:05:19 +0100
Subject: [PATCH 3/5] TMP: Simplify the Dockerfile to speed up iterations

---
 libcxx/utils/ci/Dockerfile | 444 ++++++++++++++++++-------------------
 1 file changed, 222 insertions(+), 222 deletions(-)

diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index dbecfd9fd3325d..cea1b473401b93 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -70,228 +70,228 @@ RUN sudo apt-get update \
     && sudo apt-get install -y \
         tzdata
 
-RUN sudo apt-get update \
-    && sudo apt-get install -y \
-        bash \
-        ccache \
-        curl \
-        gdb \
-        git \
-        gpg \
-        language-pack-en \
-        language-pack-fr \
-        language-pack-ja \
-        language-pack-ru \
-        language-pack-zh-hans \
-        libedit-dev \
-        libncurses5-dev \
-        libpython3-dev \
-        libxml2-dev \
-        lsb-release \
-        make \
-        python3 \
-        python3-dev \
-        python3-packaging \
-        python3-setuptools \
-        python3-psutil \
-        software-properties-common \
-        swig \
-        unzip \
-        uuid-dev \
-        wget \
-        xz-utils \
-    && sudo rm -rf /var/lib/apt/lists/*
-
-# Install various tools used by the build or the test suite
-#RUN apt-get update && apt-get install -y ninja-build python3 python3-distutils python3-psutil git gdb ccache
-# TODO add ninja-build once 1.11 is available in Ubuntu, also remove the manual installation.
-RUN <<EOF
-  set -e
-  wget -qO /tmp/ninja.gz https://github.com/ninja-build/ninja/releases/latest/download/ninja-linux.zip
-  gunzip /tmp/ninja.gz
-  chmod a+x /tmp/ninja
-  sudo mv /tmp/ninja /usr/local/bin/ninja
-EOF
-
-
-# These two locales are not enabled by default so generate them
-RUN <<EOF
-  set -e
-  printf "fr_CA ISO-8859-1\ncs_CZ ISO-8859-2" | sudo tee -a /etc/locale.gen
-  sudo mkdir /usr/local/share/i1en/
-  printf "fr_CA ISO-8859-1\ncs_CZ ISO-8859-2" | sudo tee -a /usr/local/share/i1en/SUPPORTED
-  sudo locale-gen
-EOF
-
-# Install Clang <latest>, <latest-1> and ToT, which are the ones we support.
-# We also install <latest-2> because we need to support the "latest-1" of the
-# current LLVM release branch, which is effectively the <latest-2> of the
-# tip-of-trunk LLVM. For example, after branching LLVM 14 but before branching
-# LLVM 15, we still need to have Clang 12 in this Docker image because the LLVM
-# 14 release branch CI uses it. The tip-of-trunk CI will never use Clang 12,
-# though.
-RUN <<EOF
-  set -e
-  sudo apt-get update
-  wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh
-  chmod +x /tmp/llvm.sh
-  sudo /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 3)) all  # for CI transitions
-  sudo /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 2)) all  # previous release
-  sudo /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 1)) all  # latest release
-  sudo /tmp/llvm.sh $LLVM_HEAD_VERSION          all  # current ToT
-  sudo apt-get install -y libomp5-$LLVM_HEAD_VERSION
-  sudo rm -rf /var/lib/apt/lists/*
-EOF
-
-# Install the most recent GCC, like clang install the previous version as a transition.
-RUN <<EOF
-  set -e
-  sudo git clone https://github.com/compiler-explorer/infra.git /tmp/ce-infra
-  (cd /tmp/ce-infra && sudo make ce)
-  sudo /tmp/ce-infra/bin/ce_install install compilers/c++/x86/gcc $GCC_LATEST_VERSION.1.0
-  sudo /tmp/ce-infra/bin/ce_install install compilers/c++/x86/gcc $((GCC_LATEST_VERSION - 1)).1.0
-  sudo ln -s /opt/compiler-explorer/gcc-$GCC_LATEST_VERSION.1.0/bin/gcc /usr/bin/gcc-$GCC_LATEST_VERSION
-  sudo ln -s /opt/compiler-explorer/gcc-$GCC_LATEST_VERSION.1.0/bin/g++ /usr/bin/g++-$GCC_LATEST_VERSION
-  sudo ln -s /opt/compiler-explorer/gcc-$((GCC_LATEST_VERSION - 1)).1.0/bin/gcc /usr/bin/gcc-$((GCC_LATEST_VERSION - 1))
-  sudo ln -s /opt/compiler-explorer/gcc-$((GCC_LATEST_VERSION - 1)).1.0/bin/g++ /usr/bin/g++-$((GCC_LATEST_VERSION - 1))
-  sudo rm -rf /tmp/ce-infra
-EOF
-
-RUN <<EOF
-    # Install a recent CMake
-    set -e
-    wget https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-linux-x86_64.sh -O /tmp/install-cmake.sh
-    sudo bash /tmp/install-cmake.sh --prefix=/usr --exclude-subdir --skip-license
-    rm /tmp/install-cmake.sh
-EOF
-
-# ===----------------------------------------------------------------------===##
-#                       Android Builder Base Image
-# ===----------------------------------------------------------------------===##
-
-FROM ubuntu:jammy AS android-builder-base
-
-ARG ANDROID_CLANG_VERSION
-ARG ANDROID_CLANG_PREBUILTS_COMMIT
-ARG ANDROID_SYSROOT_BID
-
-RUN apt-get update && apt-get install -y curl bzip2 git unzip
-
-# Install the Android platform tools (e.g. adb) into /opt/android/sdk.
-RUN <<EOF
-  set -e
-  mkdir -p /opt/android/sdk
-  cd /opt/android/sdk
-  curl -LO https://dl.google.com/android/repository/platform-tools-latest-linux.zip
-  unzip platform-tools-latest-linux.zip
-  rm platform-tools-latest-linux.zip
-EOF
-
-# Install the current Android compiler. Specify the prebuilts commit to retrieve
-# this compiler version even after it's removed from HEAD.
-
-ENV ANDROID_CLANG_VERSION=$ANDROID_CLANG_VERSION
-ENV ANDROID_CLANG_PREBUILTS_COMMIT=$ANDROID_CLANG_PREBUILTS_COMMIT
-RUN <<EOF
-    set -e
-    git clone --filter=blob:none --sparse \
-        https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86 \
-        /opt/android/clang
-    git -C /opt/android/clang checkout ${ANDROID_CLANG_PREBUILTS_COMMIT}
-    git -C /opt/android/clang sparse-checkout add clang-${ANDROID_CLANG_VERSION}
-    rm -fr /opt/android/clang/.git
-    ln -sf /opt/android/clang/clang-${ANDROID_CLANG_VERSION} /opt/android/clang/clang-current
-    # The "git sparse-checkout" and "ln" commands succeed even if nothing was
-    # checked out, so use this "ls" command to fix that.
-    ls /opt/android/clang/clang-current/bin/clang
-EOF
-
-# Install an Android sysroot. New AOSP sysroots are available at
-# https://ci.android.com/builds/branches/aosp-main/grid, the "ndk" target. The
-# NDK also makes its sysroot prebuilt available at
-# https://android.googlesource.com/platform/prebuilts/ndk/+/refs/heads/dev/platform/sysroot.
-
-ENV ANDROID_SYSROOT_BID=$ANDROID_SYSROOT_BID
-RUN <<EOF
-  set -e
-  cd /opt/android
-  curl -L -o ndk_platform.tar.bz2 \
-      https://androidbuildinternal.googleapis.com/android/internal/build/v3/builds/${ANDROID_SYSROOT_BID}/ndk/attempts/latest/artifacts/ndk_platform.tar.bz2/url
-  tar xf ndk_platform.tar.bz2
-  rm ndk_platform.tar.bz2
-EOF
-
-# ===----------------------------------------------------------------------===##
-#                    Buildkite Builder Image
-# ===----------------------------------------------------------------------===##
-#
-# IMAGE: ghcr.io/libcxx/buildkite-builder.
-#
-FROM builder-base AS buildkite-builder
-
-# Create the libcxx-builder user, regardless of if we use it or not
-RUN sudo useradd --create-home libcxx-builder
-
-USER libcxx-builder
-WORKDIR /home/libcxx-builder
-
-# Install the Buildkite agent and dependencies. This must be done as non-root
-# for the Buildkite agent to be installed in a path where we can find it.
-RUN <<EOF
-  set -e
-  cd /home/libcxx-builder
-  curl -sL https://raw.githubusercontent.com/buildkite/agent/main/install.sh -o /tmp/install-agent.sh
-  bash /tmp/install-agent.sh
-  rm /tmp/install-agent.sh
-  echo "tags=\"queue=libcxx-builders,arch=$(uname -m),os=linux\"" \
-    >> /home/libcxx-builder/.buildkite-agent/buildkite-agent.cfg
-EOF
-
-USER libcxx-builder
-WORKDIR /home/libcxx-builder
-
-ENV PATH="${PATH}:/home/libcxx-builder/.buildkite-agent/bin"
-
-CMD ["buildkite-agent", "start"]
-
-# ===----------------------------------------------------------------------===##
-#                    Android Buildkite Builder Image
-# ===----------------------------------------------------------------------===##
-#
-# IMAGE: ghcr.io/libcxx/android-buildkite-builder.
-#
-FROM buildkite-builder AS android-buildkite-builder
-
-COPY --from=android-builder-base /opt/android /opt/android
-COPY ./vendor/android/container-setup.sh /opt/android/container-setup.sh
-
-ENV PATH="/opt/android/sdk/platform-tools:${PATH}"
-
-USER root
-
-# Install Docker
-RUN <<EOF
-  set -e
-  curl -fsSL https://get.docker.com -o /tmp/get-docker.sh
-  sh /tmp/get-docker.sh
-  rm /tmp/get-docker.sh
-
-  # Install Docker. Mark the binary setuid so it can be run without prefixing it
-  # with sudo. Adding the container user to the docker group doesn't work because
-  # /var/run/docker.sock is owned by the host's docker GID, not the container's
-  # docker GID.
-  chmod u+s /usr/bin/docker
-EOF
-
-USER libcxx-builder
-WORKDIR /home/libcxx-builder
-
-# Reset the configuration, we pass the configuration via the environment.
-RUN cp /home/libcxx-builder/.buildkite-agent/buildkite-agent.dist.cfg \
-       /home/libcxx-builder/.buildkite-agent/buildkite-agent.cfg
-
-# Modify the Buildkite agent cmdline to do Android setup stuff first.
-CMD /opt/android/container-setup.sh && buildkite-agent start
+# RUN sudo apt-get update \
+#     && sudo apt-get install -y \
+#         bash \
+#         ccache \
+#         curl \
+#         gdb \
+#         git \
+#         gpg \
+#         language-pack-en \
+#         language-pack-fr \
+#         language-pack-ja \
+#         language-pack-ru \
+#         language-pack-zh-hans \
+#         libedit-dev \
+#         libncurses5-dev \
+#         libpython3-dev \
+#         libxml2-dev \
+#         lsb-release \
+#         make \
+#         python3 \
+#         python3-dev \
+#         python3-packaging \
+#         python3-setuptools \
+#         python3-psutil \
+#         software-properties-common \
+#         swig \
+#         unzip \
+#         uuid-dev \
+#         wget \
+#         xz-utils \
+#     && sudo rm -rf /var/lib/apt/lists/*
+
+# # Install various tools used by the build or the test suite
+# #RUN apt-get update && apt-get install -y ninja-build python3 python3-distutils python3-psutil git gdb ccache
+# # TODO add ninja-build once 1.11 is available in Ubuntu, also remove the manual installation.
+# RUN <<EOF
+#   set -e
+#   wget -qO /tmp/ninja.gz https://github.com/ninja-build/ninja/releases/latest/download/ninja-linux.zip
+#   gunzip /tmp/ninja.gz
+#   chmod a+x /tmp/ninja
+#   sudo mv /tmp/ninja /usr/local/bin/ninja
+# EOF
+
+
+# # These two locales are not enabled by default so generate them
+# RUN <<EOF
+#   set -e
+#   printf "fr_CA ISO-8859-1\ncs_CZ ISO-8859-2" | sudo tee -a /etc/locale.gen
+#   sudo mkdir /usr/local/share/i1en/
+#   printf "fr_CA ISO-8859-1\ncs_CZ ISO-8859-2" | sudo tee -a /usr/local/share/i1en/SUPPORTED
+#   sudo locale-gen
+# EOF
+
+# # Install Clang <latest>, <latest-1> and ToT, which are the ones we support.
+# # We also install <latest-2> because we need to support the "latest-1" of the
+# # current LLVM release branch, which is effectively the <latest-2> of the
+# # tip-of-trunk LLVM. For example, after branching LLVM 14 but before branching
+# # LLVM 15, we still need to have Clang 12 in this Docker image because the LLVM
+# # 14 release branch CI uses it. The tip-of-trunk CI will never use Clang 12,
+# # though.
+# RUN <<EOF
+#   set -e
+#   sudo apt-get update
+#   wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh
+#   chmod +x /tmp/llvm.sh
+#   sudo /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 3)) all  # for CI transitions
+#   sudo /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 2)) all  # previous release
+#   sudo /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 1)) all  # latest release
+#   sudo /tmp/llvm.sh $LLVM_HEAD_VERSION          all  # current ToT
+#   sudo apt-get install -y libomp5-$LLVM_HEAD_VERSION
+#   sudo rm -rf /var/lib/apt/lists/*
+# EOF
+
+# # Install the most recent GCC, like clang install the previous version as a transition.
+# RUN <<EOF
+#   set -e
+#   sudo git clone https://github.com/compiler-explorer/infra.git /tmp/ce-infra
+#   (cd /tmp/ce-infra && sudo make ce)
+#   sudo /tmp/ce-infra/bin/ce_install install compilers/c++/x86/gcc $GCC_LATEST_VERSION.1.0
+#   sudo /tmp/ce-infra/bin/ce_install install compilers/c++/x86/gcc $((GCC_LATEST_VERSION - 1)).1.0
+#   sudo ln -s /opt/compiler-explorer/gcc-$GCC_LATEST_VERSION.1.0/bin/gcc /usr/bin/gcc-$GCC_LATEST_VERSION
+#   sudo ln -s /opt/compiler-explorer/gcc-$GCC_LATEST_VERSION.1.0/bin/g++ /usr/bin/g++-$GCC_LATEST_VERSION
+#   sudo ln -s /opt/compiler-explorer/gcc-$((GCC_LATEST_VERSION - 1)).1.0/bin/gcc /usr/bin/gcc-$((GCC_LATEST_VERSION - 1))
+#   sudo ln -s /opt/compiler-explorer/gcc-$((GCC_LATEST_VERSION - 1)).1.0/bin/g++ /usr/bin/g++-$((GCC_LATEST_VERSION - 1))
+#   sudo rm -rf /tmp/ce-infra
+# EOF
+
+# RUN <<EOF
+#     # Install a recent CMake
+#     set -e
+#     wget https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-linux-x86_64.sh -O /tmp/install-cmake.sh
+#     sudo bash /tmp/install-cmake.sh --prefix=/usr --exclude-subdir --skip-license
+#     rm /tmp/install-cmake.sh
+# EOF
+
+# # ===----------------------------------------------------------------------===##
+# #                       Android Builder Base Image
+# # ===----------------------------------------------------------------------===##
+
+# FROM ubuntu:jammy AS android-builder-base
+
+# ARG ANDROID_CLANG_VERSION
+# ARG ANDROID_CLANG_PREBUILTS_COMMIT
+# ARG ANDROID_SYSROOT_BID
+
+# RUN apt-get update && apt-get install -y curl bzip2 git unzip
+
+# # Install the Android platform tools (e.g. adb) into /opt/android/sdk.
+# RUN <<EOF
+#   set -e
+#   mkdir -p /opt/android/sdk
+#   cd /opt/android/sdk
+#   curl -LO https://dl.google.com/android/repository/platform-tools-latest-linux.zip
+#   unzip platform-tools-latest-linux.zip
+#   rm platform-tools-latest-linux.zip
+# EOF
+
+# # Install the current Android compiler. Specify the prebuilts commit to retrieve
+# # this compiler version even after it's removed from HEAD.
+
+# ENV ANDROID_CLANG_VERSION=$ANDROID_CLANG_VERSION
+# ENV ANDROID_CLANG_PREBUILTS_COMMIT=$ANDROID_CLANG_PREBUILTS_COMMIT
+# RUN <<EOF
+#     set -e
+#     git clone --filter=blob:none --sparse \
+#         https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86 \
+#         /opt/android/clang
+#     git -C /opt/android/clang checkout ${ANDROID_CLANG_PREBUILTS_COMMIT}
+#     git -C /opt/android/clang sparse-checkout add clang-${ANDROID_CLANG_VERSION}
+#     rm -fr /opt/android/clang/.git
+#     ln -sf /opt/android/clang/clang-${ANDROID_CLANG_VERSION} /opt/android/clang/clang-current
+#     # The "git sparse-checkout" and "ln" commands succeed even if nothing was
+#     # checked out, so use this "ls" command to fix that.
+#     ls /opt/android/clang/clang-current/bin/clang
+# EOF
+
+# # Install an Android sysroot. New AOSP sysroots are available at
+# # https://ci.android.com/builds/branches/aosp-main/grid, the "ndk" target. The
+# # NDK also makes its sysroot prebuilt available at
+# # https://android.googlesource.com/platform/prebuilts/ndk/+/refs/heads/dev/platform/sysroot.
+
+# ENV ANDROID_SYSROOT_BID=$ANDROID_SYSROOT_BID
+# RUN <<EOF
+#   set -e
+#   cd /opt/android
+#   curl -L -o ndk_platform.tar.bz2 \
+#       https://androidbuildinternal.googleapis.com/android/internal/build/v3/builds/${ANDROID_SYSROOT_BID}/ndk/attempts/latest/artifacts/ndk_platform.tar.bz2/url
+#   tar xf ndk_platform.tar.bz2
+#   rm ndk_platform.tar.bz2
+# EOF
+
+# # ===----------------------------------------------------------------------===##
+# #                    Buildkite Builder Image
+# # ===----------------------------------------------------------------------===##
+# #
+# # IMAGE: ghcr.io/libcxx/buildkite-builder.
+# #
+# FROM builder-base AS buildkite-builder
+
+# # Create the libcxx-builder user, regardless of if we use it or not
+# RUN sudo useradd --create-home libcxx-builder
+
+# USER libcxx-builder
+# WORKDIR /home/libcxx-builder
+
+# # Install the Buildkite agent and dependencies. This must be done as non-root
+# # for the Buildkite agent to be installed in a path where we can find it.
+# RUN <<EOF
+#   set -e
+#   cd /home/libcxx-builder
+#   curl -sL https://raw.githubusercontent.com/buildkite/agent/main/install.sh -o /tmp/install-agent.sh
+#   bash /tmp/install-agent.sh
+#   rm /tmp/install-agent.sh
+#   echo "tags=\"queue=libcxx-builders,arch=$(uname -m),os=linux\"" \
+#     >> /home/libcxx-builder/.buildkite-agent/buildkite-agent.cfg
+# EOF
+
+# USER libcxx-builder
+# WORKDIR /home/libcxx-builder
+
+# ENV PATH="${PATH}:/home/libcxx-builder/.buildkite-agent/bin"
+
+# CMD ["buildkite-agent", "start"]
+
+# # ===----------------------------------------------------------------------===##
+# #                    Android Buildkite Builder Image
+# # ===----------------------------------------------------------------------===##
+# #
+# # IMAGE: ghcr.io/libcxx/android-buildkite-builder.
+# #
+# FROM buildkite-builder AS android-buildkite-builder
+
+# COPY --from=android-builder-base /opt/android /opt/android
+# COPY ./vendor/android/container-setup.sh /opt/android/container-setup.sh
+
+# ENV PATH="/opt/android/sdk/platform-tools:${PATH}"
+
+# USER root
+
+# # Install Docker
+# RUN <<EOF
+#   set -e
+#   curl -fsSL https://get.docker.com -o /tmp/get-docker.sh
+#   sh /tmp/get-docker.sh
+#   rm /tmp/get-docker.sh
+
+#   # Install Docker. Mark the binary setuid so it can be run without prefixing it
+#   # with sudo. Adding the container user to the docker group doesn't work because
+#   # /var/run/docker.sock is owned by the host's docker GID, not the container's
+#   # docker GID.
+#   chmod u+s /usr/bin/docker
+# EOF
+
+# USER libcxx-builder
+# WORKDIR /home/libcxx-builder
+
+# # Reset the configuration, we pass the configuration via the environment.
+# RUN cp /home/libcxx-builder/.buildkite-agent/buildkite-agent.dist.cfg \
+#        /home/libcxx-builder/.buildkite-agent/buildkite-agent.cfg
+
+# # Modify the Buildkite agent cmdline to do Android setup stuff first.
+# CMD /opt/android/container-setup.sh && buildkite-agent start
 
 # ===----------------------------------------------------------------------===##
 #                    Github Actions Builder Image

>From 7eefc4e39da8e6bb651935edd237c4c8d5a98d47 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Fri, 15 Nov 2024 11:19:56 +0100
Subject: [PATCH 4/5] Disable normal libc++ pipeline for testing purposes

---
 .github/workflows/libcxx-build-and-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/libcxx-build-and-test.yaml b/.github/workflows/libcxx-build-and-test.yaml
index 91b929732f2808..783796135769cd 100644
--- a/.github/workflows/libcxx-build-and-test.yaml
+++ b/.github/workflows/libcxx-build-and-test.yaml
@@ -48,7 +48,7 @@ env:
 
 jobs:
   stage1:
-    if: github.repository_owner == 'llvm'
+    if: github.repository_owner == 'SKIP THIS FOR NOW'
     runs-on: libcxx-runners-set
     container: ghcr.io/libcxx/actions-builder:testing-2024-09-21
     continue-on-error: false

>From a469423e87b69ae6a8879bda0c79de8976024fa1 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Fri, 15 Nov 2024 11:20:27 +0100
Subject: [PATCH 5/5] Disable buildkite too

---
 libcxx/utils/ci/buildkite-pipeline.yml | 218 ++++++++++++-------------
 1 file changed, 109 insertions(+), 109 deletions(-)

diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
index 36abefe41e2cd0..e1c28ddad95af5 100644
--- a/libcxx/utils/ci/buildkite-pipeline.yml
+++ b/libcxx/utils/ci/buildkite-pipeline.yml
@@ -40,112 +40,112 @@ definitions:
       - "**/CMakeOutput.log"
 
 steps:
-- group: ARM
-  steps:
-  - label: AArch64
-    command: libcxx/utils/ci/run-buildbot aarch64
-    agents:
-      queue: libcxx-builders-linaro-arm
-      arch: aarch64
-    <<: *common
-
-  - label: AArch64 -fno-exceptions
-    command: libcxx/utils/ci/run-buildbot aarch64-no-exceptions
-    agents:
-      queue: libcxx-builders-linaro-arm
-      arch: aarch64
-    <<: *common
-
-  - label: Armv8
-    command: libcxx/utils/ci/run-buildbot armv8
-    agents:
-      queue: libcxx-builders-linaro-arm
-      arch: armv8l
-    <<: *common
-
-  - label: Armv8 -fno-exceptions
-    command: libcxx/utils/ci/run-buildbot armv8-no-exceptions
-    agents:
-      queue: libcxx-builders-linaro-arm
-      arch: armv8l
-    <<: *common
-
-  - label: Armv7
-    command: libcxx/utils/ci/run-buildbot armv7
-    agents:
-      queue: libcxx-builders-linaro-arm
-      arch: armv8l
-    <<: *common
-
-  - label: Armv7 -fno-exceptions
-    command: libcxx/utils/ci/run-buildbot armv7-no-exceptions
-    agents:
-      queue: libcxx-builders-linaro-arm
-      arch: armv8l
-    <<: *common
-
-  - label: Armv7-M picolibc
-    command: libcxx/utils/ci/run-buildbot armv7m-picolibc
-    agents:
-      queue: libcxx-builders-linaro-arm
-      arch: aarch64
-    <<: *common
-
-  - label: Armv7-M picolibc -fno-exceptions
-    command: libcxx/utils/ci/run-buildbot armv7m-picolibc-no-exceptions
-    agents:
-      queue: libcxx-builders-linaro-arm
-      arch: aarch64
-    <<: *common
-
-- group: AIX
-  steps:
-  - label: AIX (32-bit)
-    command: libcxx/utils/ci/run-buildbot aix
-    env:
-      CC: clang
-      CXX: clang++
-      OBJECT_MODE: '32'
-    agents:
-      queue: libcxx-builders
-      os: aix
-    <<: *common
-
-  - label: AIX (64-bit)
-    command: libcxx/utils/ci/run-buildbot aix
-    env:
-      CC: clang
-      CXX: clang++
-      OBJECT_MODE: '64'
-    agents:
-      queue: libcxx-builders
-      os: aix
-    <<: *common
-
-- group: ':freebsd: FreeBSD'
-  steps:
-  - label: FreeBSD 13 amd64
-    command: libcxx/utils/ci/run-buildbot generic-cxx26
-    env:
-      CC: clang17
-      CXX: clang++17
-    agents:
-      queue: libcxx-builders
-      os: freebsd
-    <<: *common
-
-- group: ':android: Android'
-  steps:
-  - label: Android 5.0, x86 NDK
-    command: libcxx/utils/ci/run-buildbot android-ndk-21-def-x86
-    agents:
-      queue: libcxx-builders
-      os: android
-    <<: *common
-
-  - label: Android 13, x86_64 NDK
-    command: libcxx/utils/ci/run-buildbot android-ndk-33-goog-x86_64
-    agents:
-      queue: libcxx-builders
-      os: android
-    <<: *common
+# - group: ARM
+#   steps:
+#   - label: AArch64
+#     command: libcxx/utils/ci/run-buildbot aarch64
+#     agents:
+#       queue: libcxx-builders-linaro-arm
+#       arch: aarch64
+#     <<: *common
+
+#   - label: AArch64 -fno-exceptions
+#     command: libcxx/utils/ci/run-buildbot aarch64-no-exceptions
+#     agents:
+#       queue: libcxx-builders-linaro-arm
+#       arch: aarch64
+#     <<: *common
+
+#   - label: Armv8
+#     command: libcxx/utils/ci/run-buildbot armv8
+#     agents:
+#       queue: libcxx-builders-linaro-arm
+#       arch: armv8l
+#     <<: *common
+
+#   - label: Armv8 -fno-exceptions
+#     command: libcxx/utils/ci/run-buildbot armv8-no-exceptions
+#     agents:
+#       queue: libcxx-builders-linaro-arm
+#       arch: armv8l
+#     <<: *common
+
+#   - label: Armv7
+#     command: libcxx/utils/ci/run-buildbot armv7
+#     agents:
+#       queue: libcxx-builders-linaro-arm
+#       arch: armv8l
+#     <<: *common
+
+#   - label: Armv7 -fno-exceptions
+#     command: libcxx/utils/ci/run-buildbot armv7-no-exceptions
+#     agents:
+#       queue: libcxx-builders-linaro-arm
+#       arch: armv8l
+#     <<: *common
+
+#   - label: Armv7-M picolibc
+#     command: libcxx/utils/ci/run-buildbot armv7m-picolibc
+#     agents:
+#       queue: libcxx-builders-linaro-arm
+#       arch: aarch64
+#     <<: *common
+
+#   - label: Armv7-M picolibc -fno-exceptions
+#     command: libcxx/utils/ci/run-buildbot armv7m-picolibc-no-exceptions
+#     agents:
+#       queue: libcxx-builders-linaro-arm
+#       arch: aarch64
+#     <<: *common
+
+# - group: AIX
+#   steps:
+#   - label: AIX (32-bit)
+#     command: libcxx/utils/ci/run-buildbot aix
+#     env:
+#       CC: clang
+#       CXX: clang++
+#       OBJECT_MODE: '32'
+#     agents:
+#       queue: libcxx-builders
+#       os: aix
+#     <<: *common
+
+#   - label: AIX (64-bit)
+#     command: libcxx/utils/ci/run-buildbot aix
+#     env:
+#       CC: clang
+#       CXX: clang++
+#       OBJECT_MODE: '64'
+#     agents:
+#       queue: libcxx-builders
+#       os: aix
+#     <<: *common
+
+# - group: ':freebsd: FreeBSD'
+#   steps:
+#   - label: FreeBSD 13 amd64
+#     command: libcxx/utils/ci/run-buildbot generic-cxx26
+#     env:
+#       CC: clang17
+#       CXX: clang++17
+#     agents:
+#       queue: libcxx-builders
+#       os: freebsd
+#     <<: *common
+
+# - group: ':android: Android'
+#   steps:
+#   - label: Android 5.0, x86 NDK
+#     command: libcxx/utils/ci/run-buildbot android-ndk-21-def-x86
+#     agents:
+#       queue: libcxx-builders
+#       os: android
+#     <<: *common
+
+#   - label: Android 13, x86_64 NDK
+#     command: libcxx/utils/ci/run-buildbot android-ndk-33-goog-x86_64
+#     agents:
+#       queue: libcxx-builders
+#       os: android
+#     <<: *common



More information about the libcxx-commits mailing list