From d9d20802d0ce757d4b33d6bd67d700e3272bc8b6 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Mon, 14 Jun 2021 15:55:36 -0400 Subject: [PATCH] [libc++] Clean up scripts to setup CI on macOS --- libcxx/docs/AddingNewCIJobs.rst | 2 +- libcxx/utils/ci/macos-ci-setup | 5 ++++- libcxx/utils/ci/secrets.env | 8 -------- 3 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 libcxx/utils/ci/secrets.env diff --git a/libcxx/docs/AddingNewCIJobs.rst b/libcxx/docs/AddingNewCIJobs.rst index 1ac3aa9..4a07393 100644 --- a/libcxx/docs/AddingNewCIJobs.rst +++ b/libcxx/docs/AddingNewCIJobs.rst @@ -17,7 +17,7 @@ If you need to run the job on your own machines, please follow the `Buildkite guide `_ to setup your own agents. Make sure you tag your agents in a way that you'll be able to recognize them when defining your job below. Finally, in order for the -agent to register itself to Buildkite, it will need a ``BUILDKITE_AGENT_TOKEN``. +agent to register itself to Buildkite, it will need a BuildKite Agent token. Please contact a maintainer to get your token. Then, simply add a job to the Buildkite pipeline by editing ``libcxx/utils/ci/buildkite-pipeline.yml``. diff --git a/libcxx/utils/ci/macos-ci-setup b/libcxx/utils/ci/macos-ci-setup index f59f50d..5cb9d1e 100755 --- a/libcxx/utils/ci/macos-ci-setup +++ b/libcxx/utils/ci/macos-ci-setup @@ -4,7 +4,10 @@ # An additional requirement that is *not* handled by this script is the # installation of Xcode, which requires manual intervention. -source secrets.env +if [[ -z "${BUILDKITE_AGENT_TOKEN}" ]]; then + echo "The BUILDKITE_AGENT_TOKEN environment variable must be set to a BuildKite Agent token when calling this script." + exit 1 +fi # Install Homebrew /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" diff --git a/libcxx/utils/ci/secrets.env b/libcxx/utils/ci/secrets.env deleted file mode 100644 index 7422b1b..0000000 --- a/libcxx/utils/ci/secrets.env +++ /dev/null @@ -1,8 +0,0 @@ -# -# This file template shows which environment variables are required to run -# libc++ CI nodes. The actual values of these tokens must obviously never be -# checked in. -# - -# Required to register a new agent with Buildkite -BUILDKITE_AGENT_TOKEN= -- 2.7.4