From d546d538f3815268c67bbc84d7020515c1384d3c Mon Sep 17 00:00:00 2001
From: Robert Helmer <rhelmer@mozilla.com>
Date: Mon, 13 Sep 2021 19:42:15 -0700
Subject: [PATCH] override functions package-lock before merge to deploy CI
 (#126)

---
 .circleci/config.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8368126f..2fe0c6bb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -60,7 +60,9 @@ jobs:
             git config user.name "ci-build"
       - run:
           name: Checkout deploy branch and rebase onto master
-          command: git checkout deploy && git rebase master
+          command: |
+            git checkout functions/package-lock.json
+            git checkout deploy && git rebase master
       - run:
           name: Set up ssh known_hosts # https://circleci.com/docs/2.0/gh-bb-integration/
           command: |
@@ -70,7 +72,6 @@ jobs:
       - run:
           name: Add website build output to git
           command: |
-            git checkout functions/package-lock.json
             git add -f functions/lib/ build/
       - add_ssh_keys:
           fingerprints: