Merge #267

267: fix tests r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>

.github/workflows/test.yml

@@ -1,6 +1,11 @@
 name: "Test"
 on:
   pull_request:
+  push:
+    branches:
+      - master
+      - staging
+      - release-*
   schedule:
     - cron:  '51 2 * * *'
 jobs:

.github/workflows/upgrade-flakes.yml

@@ -13,9 +13,14 @@ jobs:
         uses: cachix/install-nix-action@v18
         with:
           extra_nix_config: |
-            experimental-features = nix-command flakes
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
       - name: Update flake.lock
         uses: DeterminateSystems/update-flake-lock@v16
         with:
           token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
+          pr-body: |
+            Automated changes by the update-flake-lock
+            ```
+            {{ env.GIT_COMMIT_MESSAGE }}
+            ```
+            bors merge

.mergify.yml

@@ -1,29 +0,0 @@
-pull_request_rules:
-  - name: automatic merge on CI success
-    conditions:
-      - check-success=tests
-      - check-success=Evaluate flake.nix
-      - check-success=package lint [x86_64-linux]
-      - check-success=package cross-build [x86_64-linux]
-      - check-success=package ssh-to-pgp [x86_64-linux]
-      - check-success=check pgp-keys-22_11 [x86_64-linux]
-      - check-success=check age-keys [x86_64-linux]
-      - check-success=package sops-install-secrets [x86_64-linux]
-      - check-success=check sops-import-keys-hook-22_11 [x86_64-linux]
-      - check-success=package sops-import-keys-hook [x86_64-linux]
-      - check-success=check age-keys-22_11 [x86_64-linux]
-      - check-success=check age-ssh-keys [x86_64-linux]
-      - check-success=package sops-pgp-hook [x86_64-linux]
-      - check-success=check lint-22_11 [x86_64-linux]
-      - check-success=check sops-init-gpg-key-22_11 [x86_64-linux]
-      - check-success=check ssh-keys-22_11 [x86_64-linux]
-      - check-success=check pruning-22_11 [x86_64-linux]
-      - check-success=check sops-pgp-hook-22_11 [x86_64-linux]
-      - check-success=package sops-pgp-hook-test [x86_64-linux]
-      - check-success=check pruning [x86_64-linux]
-      - check-success=check sops-pgp-hook-test-22_11 [x86_64-linux]
-      - author=sops-nix-bot
-    actions:
-      merge:
-        method: merge
-      delete_head_branch: {}

bors.toml

@@ -19,7 +19,6 @@ status = [
   "check ssh-keys-22_11 [x86_64-linux]",
   "check ssh-to-pgp-22_11 [x86_64-linux]",
   "check unit-tests-22_11 [x86_64-linux]",
-  "createPullRequest",
   "default devShell [x86_64-linux]",
   "default package [x86_64-linux]",
   "package cross-build [x86_64-linux]",

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1675153841,
-        "narHash": "sha256-EWvU3DLq+4dbJiukfhS7r6sWZyJikgXn6kNl7eHljW8=",
+        "lastModified": 1675158573,
+        "narHash": "sha256-HkKEZA/8mt7iJ2eotjPMz6XUdjBW8E2aH0AoqLJ9vEs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ea692c2ad1afd6384e171eabef4f0887d2b882d3",
+        "rev": "e3945057be467f32028ff6b67403be08285ad8c8",
         "type": "github"
       },
       "original": {
@@ -18,11 +18,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1675215157,
-        "narHash": "sha256-bdEmR5m4usTGPiLMfL56TMLOdig1ARYHlppxMZJ0/V4=",
+        "lastModified": 1675265860,
+        "narHash": "sha256-PZNqc4ZnTRT34NsHJYbXn+Yhghh56l8HEXn39SMpGNc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "af10c1043b37230e8ac58c76d88c08742077e9c3",
+        "rev": "a3a1400571e3b9ccc270c2e8d36194cf05aab6ce",
         "type": "github"
       },
       "original": {

pkgs/sops-install-secrets/main_test.go

@@ -349,7 +349,6 @@ func TestIsValidFormat(t *testing.T) {
 	}
 	for _, format := range []string{string(Yaml), string(Json), string(Binary), string(Dotenv)} {
 		generateCase(format, true)
-		generateCase(strings.Title(format), false)
 		generateCase(strings.ToUpper(format), false)
 	}
 }