From 4559e344e02d2a83aaab0521c8981b4045308770 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 22 Dec 2024 16:13:21 +0100 Subject: [PATCH 1/2] ci: details --- .github/workflows/ci.yml | 4 ++-- .github/workflows/{update.yml => update-flake-lock.yml} | 4 ++-- .mergify.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename .github/workflows/{update.yml => update-flake-lock.yml} (76%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 74237ed..483f69e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,10 +3,10 @@ name: "Build dev shell" on: push: branches: - - main + - main pull_request: branches: - - main + - main jobs: ci: diff --git a/.github/workflows/update.yml b/.github/workflows/update-flake-lock.yml similarity index 76% rename from .github/workflows/update.yml rename to .github/workflows/update-flake-lock.yml index 31f4ada..9f01b4e 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update-flake-lock.yml @@ -1,9 +1,9 @@ name: update-flake-lock on: - workflow_dispatch: # allows manual triggering + workflow_dispatch: schedule: - - cron: '0 0 * * 0' # runs weekly on Sunday at 00:00 + - cron: '0 0 * * 0' jobs: lockfile: diff --git a/.mergify.yml b/.mergify.yml index 523047a..8f2c232 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,8 +4,8 @@ pull_request_rules: - check-success = "ci" - check-success = "pre-commit.ci - pr" - or: - - author = pre-commit-ci[bot] - author = dependabot[bot] - author = github-actions[bot] + - author = pre-commit-ci[bot] actions: merge: From ad256586ce4cb03596696b03f2a8444be0d36a2c Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 22 Dec 2024 16:20:07 +0100 Subject: [PATCH 2/2] nix flake update --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 00718fc..ed51638 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -108,7 +108,7 @@ "patch-hpp": { "flake": false, "locked": { - "narHash": "sha256-1UakKGFjVe73LVH48jsqDbDfUpMzC7ggkquhzRD70yg=", + "narHash": "sha256-PjUvva7/n33obAxwVXrR9W/3j9qGGa1Sh6oG4q/Rl5M=", "type": "file", "url": "https://github.com/NixOS/nixpkgs/pull/362956.patch" },