From 53e7af223f8632402ed1e8eced353af0cf268734 Mon Sep 17 00:00:00 2001 From: Justin Ridgewell Date: Tue, 9 Mar 2021 19:56:22 -0500 Subject: [PATCH] Curl and bash --- .circleci/config.yml | 3 ++- .circleci/fetch_merge_commit.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c3ae2e7dfb6f..483b53f56c7d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,7 +80,8 @@ jobs: steps: - run: name: 'Fetch Merge Commit' - command: ./.circleci/fetch_merge_commit.sh fetch + # TODO: This needs to be changed to ampproject/amphtml/master after merging #33165 + command: curl -o- https://raw.githubusercontent.com/jridgewell/amphtml/build-size-base/.circleci/fetch_merge_commit.sh | bash /dev/stdin fetch - save_merge_commit 'Checks': executor: diff --git a/.circleci/fetch_merge_commit.sh b/.circleci/fetch_merge_commit.sh index 2d2f50348561..c65901609bf2 100755 --- a/.circleci/fetch_merge_commit.sh +++ b/.circleci/fetch_merge_commit.sh @@ -27,6 +27,7 @@ RED() { echo -e "\n\033[0;31m$1\033[0m"; } if [[ -z "$1" ]]; then echo "Usage: fetch_merge_commit.sh [fetch | merge]" + exit 1 fi # Push builds are only run against master and amp-release branches.