Merge branch 'master' into dependabot/cargo/percent-encoding-2.3.0

nix-community · Jun 13, 2023 · 87e00a2 · 87e00a2
2 parents fb162d7 + 200631c
commit 87e00a2
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 61 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -0,0 +1,23 @@
+queue_rules:
+  - name: default
+    merge_conditions:
+      - check-success=Evaluate flake.nix
+      - check-success=check clippy [x86_64-linux]
+      - check-success=check t00-simple [x86_64-linux]
+      - check-success=check t01-signing [x86_64-linux]
+      - check-success=check t02-varnish [x86_64-linux]
+      - check-success=check treefmt [x86_64-linux]
+      - check-success=devShell default [x86_64-linux]
+      - check-success=package default [x86_64-linux]
+      - check-success=package harmonia [x86_64-linux]
+defaults:
+  actions:
+    queue:
+      allow_merging_configuration_change: true
+pull_request_rules:
+  - name: merge using the merge queue
+    conditions:
+      - base=master
+      - label=merge-queue
+    actions:
+      queue: {}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bors.toml b/bors.toml
diff --git a/harmonia/Cargo.toml b/harmonia/Cargo.toml
@@ -25,7 +25,7 @@ http-range = "0.1"
 askama_escape = "0.10.3"
 percent-encoding = "2.3.0"
 anyhow = "1.0.71"
-tempfile = "3.5.0"
+tempfile = "3.6.0"
 
 
 libnixstore = { path = "../libnixstore" }