diff --git a/.circleci/config.yml b/.circleci/config.yml index 483b53f56c7d..a8495f381bd7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,7 @@ commands: name: 'Save Merge Commit' key: git-{{ .Branch }}-{{ .Revision }} paths: - - .circleci/merge_sha + - .merge_sha restore_merge_commit: steps: - restore_cache: diff --git a/.circleci/fetch_merge_commit.sh b/.circleci/fetch_merge_commit.sh index c65901609bf2..c9d6e3a2a4e5 100755 --- a/.circleci/fetch_merge_commit.sh +++ b/.circleci/fetch_merge_commit.sh @@ -66,12 +66,12 @@ if [[ "$1" == "fetch" ]]; then echo $(GREEN "Fetching merge SHA from $MERGE_BRANCH...") MERGE_SHA="$(git ls-remote https://github.com/ampproject/amphtml.git "$MERGE_BRANCH" | awk '{print $1}')" - echo $(GREEN "Fetched merge SHA $(MERGE_SHA)...") - echo "$MERGE_SHA" > .circleci/merge_sha + echo $(GREEN "Fetched merge SHA $MERGE_SHA...") + echo "$MERGE_SHA" > .merge_sha exit 0 fi -MERGE_SHA="$(cat .circleci/merge_sha)" +MERGE_SHA="$(cat .merge_sha)" echo $(GREEN "Fetching merge commit $MERGE_SHA...") (set -x && git pull --ff-only origin "$MERGE_SHA") || err=$? diff --git a/.gitignore b/.gitignore index 76560a6b1ecf..a89a3efc8ce3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .DS_Store .g4ignore +.merge_sha build/ .amp-dep-check c