Fixes

ampproject · Mar 10, 2021 · 8c98d69 · 8c98d69
1 parent 53e7af2
commit 8c98d69
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -1,5 +1,6 @@
 .DS_Store
 .g4ignore
+.merge_sha
 build/
 .amp-dep-check
 c