From caa501f43d876e21aff80f6e9f7a04a7d79b84aa Mon Sep 17 00:00:00 2001
From: Michael Lynch <git@mtlynch.io>
Date: Wed, 30 Nov 2022 09:11:52 -0500
Subject: [PATCH 1/4] Build Debian package and bundle outside the main branch

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index aedd47c06..1d792b86f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -209,25 +209,14 @@ workflows:
       - check_style
       - build_python
       - build_javascript
-      - build_debian_package:
-          filters:
-            branches:
-              only: master
-      - lint_debian_package:
-          requires:
-            - build_debian_package
+      - build_debian_package
+      - lint_debian_package
       - build_bundle:
           requires:
             - build_debian_package
-          filters:
-            branches:
-              only: master
       - verify_bundle:
           requires:
             - build_bundle
-          filters:
-            branches:
-              only: master
       - upload_bundle:
           requires:
             - verify_bundle

From 166442126e37dd1f36f843c99156e71b6e4e0a00 Mon Sep 17 00:00:00 2001
From: Michael Lynch <git@mtlynch.io>
Date: Wed, 30 Nov 2022 09:12:45 -0500
Subject: [PATCH 2/4] Fix dependency

---
 .circleci/config.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1d792b86f..5d3a366f4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -210,13 +210,21 @@ workflows:
       - build_python
       - build_javascript
       - build_debian_package
-      - lint_debian_package
+      - lint_debian_package:
+          requires:
+            - build_debian_package
       - build_bundle:
           requires:
             - build_debian_package
+          filters:
+            branches:
+              only: master
       - verify_bundle:
           requires:
             - build_bundle
+          filters:
+            branches:
+              only: master
       - upload_bundle:
           requires:
             - verify_bundle

From ff1bb85de299c31f08534d664ec78aa876b85d5c Mon Sep 17 00:00:00 2001
From: Michael Lynch <git@mtlynch.io>
Date: Wed, 30 Nov 2022 09:15:36 -0500
Subject: [PATCH 3/4] Adjust dependencies

---
 .circleci/config.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5d3a366f4..4446bdd14 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -216,15 +216,9 @@ workflows:
       - build_bundle:
           requires:
             - build_debian_package
-          filters:
-            branches:
-              only: master
       - verify_bundle:
           requires:
             - build_bundle
-          filters:
-            branches:
-              only: master
       - upload_bundle:
           requires:
             - verify_bundle

From 3a59449733a78b6a7af27bc1fdb66f4ad2dfd199 Mon Sep 17 00:00:00 2001
From: Michael Lynch <git@mtlynch.io>
Date: Wed, 30 Nov 2022 09:17:40 -0500
Subject: [PATCH 4/4] Add comment

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4446bdd14..40559c62e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -222,6 +222,8 @@ workflows:
       - upload_bundle:
           requires:
             - verify_bundle
+          # Uploading a new bundle affects Gatekeeper's view of the latest
+          # bundle available, so we should only do this on master.
           filters:
             branches:
               only: master