From 643aa4a3f56bfb6e2a28158177bd0ad3350e64bb Mon Sep 17 00:00:00 2001
From: Daniel Chao <daniel.h.chao@gmail.com>
Date: Tue, 5 Mar 2024 15:48:23 -0800
Subject: [PATCH] Don't require pr-approval/authenticate for PRB (#1)

It's not actually necessary to require this job for PRBs.

This will allow us to run PRB workflows if the pr-approval/authenticate
job fails.

Co-authored-by: The Pkl Team (automation) <pkl-oss@groups.apple.com>
---
 packages/pkl.impl.circleci/PklCI.pkl  | 8 ++------
 packages/pkl.impl.circleci/PklProject | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/pkl.impl.circleci/PklCI.pkl b/packages/pkl.impl.circleci/PklCI.pkl
index 9d7baf7..ab2cecf 100644
--- a/packages/pkl.impl.circleci/PklCI.pkl
+++ b/packages/pkl.impl.circleci/PklCI.pkl
@@ -16,10 +16,6 @@
 /// CI job template specifically for Pkl projects.
 module pkl.impl.circleci.PklCI
 
-// TODO: Undo this hack to break the cycle; pkl-pantry depends on pkl-project-commons and vice-versa.
-// Copied in `Config.pkl` locally, so that `pkl-project-commons` builds green and publishes.
-// Releasing `pkl-project-commons` first allows `pkl-pantry` to be released dependent on it. After `pkl-pantry`
-// is public, delete `Config.pkl` from this repository and use the `package://` import below.
 import "@circleci/Config.pkl"
 
 /// A map of user-selected names to either: orb references (strings) or orb definitions (maps).
@@ -214,13 +210,13 @@ local requireApproval = (it: String|Mapping<String, Config.WorkflowJob>) ->
   if (it is String)
     new Mapping<String, Config.WorkflowJob> {
       [it] {
-        requires { "hold"; "pr-approval/authenticate" }
+        requires { "hold" }
       }
     }
   else
     (it) {
       [it.keys.first] {
-        requires { "hold"; "pr-approval/authenticate" }
+        requires { "hold" }
       }
     }
 
diff --git a/packages/pkl.impl.circleci/PklProject b/packages/pkl.impl.circleci/PklProject
index 3c3faa3..e5bb52b 100644
--- a/packages/pkl.impl.circleci/PklProject
+++ b/packages/pkl.impl.circleci/PklProject
@@ -16,7 +16,7 @@
 amends "../basePklProject.pkl"
 
 package {
-  version = "1.0.1"
+  version = "1.0.2"
 }
 
 dependencies {