🏗 Fix CircleCI config check so it works with .git caching (#35646)

ampproject · Aug 13, 2021 · d487611 · d487611
1 parent 82cc058
commit d487611
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -105,7 +105,6 @@ commands:
           name: 'Configure Development Environment'
           command: |
             ./.circleci/fetch_merge_commit.sh
-            ./.circleci/check_config.sh
             ./.circleci/restore_build_output.sh
             cat ./build-system/test-configs/hosts | sudo tee -a /etc/hosts
       - setup_node_environment
@@ -164,6 +163,9 @@ jobs:
       - run:
           name: 'Initialize Repository'
           command: ./.circleci/initialize_repo.sh
+      - run:
+          name: 'Check Config'
+          command: ./.circleci/check_config.sh
       - run:
           name: 'Initialize Workspace'
           command: cp .circleci/maybe_gracefully_halt.sh /tmp/workspace

diff --git a/.circleci/initialize_repo.sh b/.circleci/initialize_repo.sh
@@ -38,8 +38,8 @@ if [[ -z "${PR_NUMBER}" ]]; then
   exit 0
 fi
 
-echo "$(GREEN "Fetching all branches to update") $(CYAN ".git") $(GREEN "cache.")"
-git fetch
+echo "$(GREEN "Fetching") $(CYAN "main") $(GREEN "branch to update") $(CYAN ".git") $(GREEN "cache.")"
+git fetch origin main:main
 
 # GitHub provides refs/pull/<PR_NUMBER>/merge, an up-to-date merge branch for
 # every PR branch that can be cleanly merged to the main branch. For more