diff options
| author | Aiden Grossman <aidengrossman@google.com> | 2025-07-28 12:32:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-28 12:32:24 -0700 |
| commit | 6107e3aa229368190207093298c2ac1ec5eec7c0 (patch) | |
| tree | d9244faae3b5054c45d72f06d3ed100ea62f18dd /libcxx | |
| parent | 1381ad497b9a6d3da630cbef53cbfa9ddf117bb6 (diff) | |
| download | llvm-6107e3aa229368190207093298c2ac1ec5eec7c0.zip llvm-6107e3aa229368190207093298c2ac1ec5eec7c0.tar.gz llvm-6107e3aa229368190207093298c2ac1ec5eec7c0.tar.bz2 | |
[libcxx] Install runner last when building CI containers
This patch changes when we install the GHA runner in the CI containers. Instead
of having it in the base image, we install it last. This will enable a follow up
patch that will do some setup enabling building the full container image with an
existing base image, thus enabling updating the GHA runner without modifying the
important bits.
Reviewers: EricWF, ldionne
Reviewed By: ldionne
Pull Request: https://github.com/llvm/llvm-project/pull/148072
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/utils/ci/Dockerfile | 17 | ||||
| -rw-r--r-- | libcxx/utils/ci/docker-compose.yml | 3 |
2 files changed, 17 insertions, 3 deletions
diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile index 63cecea..cec4806 100644 --- a/libcxx/utils/ci/Dockerfile +++ b/libcxx/utils/ci/Dockerfile @@ -311,5 +311,18 @@ CMD /opt/android/container-setup.sh && buildkite-agent start # FROM builder-base AS actions-builder -WORKDIR /home/runner -USER runner +ARG GITHUB_RUNNER_VERSION + +RUN useradd gha -u 1001 -m -s /bin/bash +RUN adduser gha sudo +RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers +WORKDIR /home/gha +USER gha + +ENV RUNNER_MANUALLY_TRAP_SIG=1 +ENV ACTIONS_RUNNER_PRINT_LOG_TO_STDOUT=1 +RUN mkdir actions-runner && \ + cd actions-runner && \ + curl -O -L https://github.com/actions/runner/releases/download/v$GITHUB_RUNNER_VERSION/actions-runner-linux-x64-$GITHUB_RUNNER_VERSION.tar.gz && \ + tar xzf ./actions-runner-linux-x64-$GITHUB_RUNNER_VERSION.tar.gz && \ + rm ./actions-runner-linux-x64-$GITHUB_RUNNER_VERSION.tar.gz diff --git a/libcxx/utils/ci/docker-compose.yml b/libcxx/utils/ci/docker-compose.yml index 4efc6d2..3b23aa2 100644 --- a/libcxx/utils/ci/docker-compose.yml +++ b/libcxx/utils/ci/docker-compose.yml @@ -10,7 +10,8 @@ services: dockerfile: Dockerfile target: actions-builder args: - BASE_IMAGE: ghcr.io/actions/actions-runner:2.326.0 + BASE_IMAGE: ubuntu:jammy + GITHUB_RUNNER_VERSION: "2.326.0" <<: *compiler_versions android-buildkite-builder: |