Merge pull request #2129 from coronasafe/staging

ohcnetwork · May 6, 2024 · 0c91be4 · 0c91be4
2 parents d875132 + b375512
commit 0c91be4
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/.github/workflows/combine-dependencies.yml b/.github/workflows/combine-dependencies.yml
@@ -0,0 +1,23 @@
+name: Combine Dependencies
+
+on: workflow_dispatch
+
+# The minimum permissions required to run this Action
+permissions:
+  contents: write
+  pull-requests: write
+  checks: read
+
+jobs:
+  combine-prs:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Combine dependencies
+        id: combine-dependencies
+        uses: github/[email protected]
+        with:
+          pr_title: Combined dependencies # The title of the pull request to create
+          select_label: dependencies # The label which marks PRs that should be combined.
+          labels: combined-dependencies # Add a label to the combined PR
+          ci_required: "false" # Whether or not CI should be passing to combine the PR
diff --git a/Pipfile b/Pipfile
@@ -28,7 +28,7 @@ dry-rest-permissions = "==0.1.10"
 drf-nested-routers = "==0.93.4"
 drf-spectacular = "==0.26.4"
 "fhir.resources" = "==6.5.0"
-gunicorn = "==21.2.0"
+gunicorn = "==22.0.0"
 healthy-django = "==0.1.0"
 jsonschema = "==4.20.0"
 jwcrypto = "==1.5.6"

diff --git a/Pipfile.lock b/Pipfile.lock