From 64431c9fc4b841eaa66a2b08e81c9d0f6e639f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 1 Feb 2023 22:05:50 +0100 Subject: [PATCH 1/6] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/ea692c2ad1afd6384e171eabef4f0887d2b882d3' (2023-01-31) → 'github:NixOS/nixpkgs/e3945057be467f32028ff6b67403be08285ad8c8' (2023-01-31) • Updated input 'nixpkgs-stable': 'github:NixOS/nixpkgs/af10c1043b37230e8ac58c76d88c08742077e9c3' (2023-02-01) → 'github:NixOS/nixpkgs/a3a1400571e3b9ccc270c2e8d36194cf05aab6ce' (2023-02-01) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 3b21a62..ee59a35 100644 --- a/flake.lock +++ b/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": { From f234b0c865f5009f34e4e12b443e85fbb812c3f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 1 Feb 2023 22:08:03 +0100 Subject: [PATCH 2/6] TestIsValidFormat: don't use deprecated golang function --- pkgs/sops-install-secrets/main_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/sops-install-secrets/main_test.go b/pkgs/sops-install-secrets/main_test.go index c5a411e..164de79 100644 --- a/pkgs/sops-install-secrets/main_test.go +++ b/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) } } From c10480e7a78db0013c91e007bc36a8e635e4c7e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 1 Feb 2023 22:17:39 +0100 Subject: [PATCH 3/6] ci: also run when pushing to branches --- .github/workflows/test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b3f65ac..ad2ee64 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,11 @@ name: "Test" on: pull_request: + push: + branches: + - master + - staging + - release-* schedule: - cron: '51 2 * * *' jobs: From 955f7cb1b5fa85fbe3e930e68dc8525784c54490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 1 Feb 2023 22:27:23 +0100 Subject: [PATCH 4/6] bors: drop createPullRequest --- bors.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/bors.toml b/bors.toml index 89322da..bca5cfa 100644 --- a/bors.toml +++ b/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]", From 3c8cf2ecb8033b8de1de6f64588677d6ea5cc26d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 1 Feb 2023 22:27:27 +0100 Subject: [PATCH 5/6] drop mergify --- .mergify.yml | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml deleted file mode 100644 index f4d5d33..0000000 --- a/.mergify.yml +++ /dev/null @@ -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: {} From 24e51949ebacac49bf8de506e420c785157ade44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 1 Feb 2023 22:29:35 +0100 Subject: [PATCH 6/6] automerge flake-updates with bors --- .github/workflows/upgrade-flakes.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upgrade-flakes.yml b/.github/workflows/upgrade-flakes.yml index 7be8b92..b85bd91 100644 --- a/.github/workflows/upgrade-flakes.yml +++ b/.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