From 98290719d3257406d30a516ae46df566ccf2f90f Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 22 Dec 2024 17:27:48 +0100 Subject: [PATCH 1/5] mergify: handle github-actions --- .mergify.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index 8e98970..16b1c33 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -5,7 +5,8 @@ pull_request_rules: - check-success = "Nix build on ubuntu" - 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 b6a2f19bda3f42d63aca37916bf72aa1b9151a91 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 22 Dec 2024 17:28:09 +0100 Subject: [PATCH 2/5] CI: run on push/pr --- .github/workflows/nix.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index cc47550..27c4d7c 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -2,6 +2,13 @@ name: "CI - Nix" on: push: + branches: + - devel + - master + pull_request: + branches: + - devel + - master jobs: tests: From ad6df80d4ebe141fe6408dbdbee1466a81e8313b Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 22 Dec 2024 17:28:23 +0100 Subject: [PATCH 3/5] setup dependabot --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..203f3c8 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: +- package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" From 66cf0f53ef0f94c80bcb26a3a5d8f7c889c77156 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 22 Dec 2024 17:28:53 +0100 Subject: [PATCH 4/5] update flake lock --- .github/workflows/update-flake-lock.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/update-flake-lock.yml diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml new file mode 100644 index 0000000..ebb15ff --- /dev/null +++ b/.github/workflows/update-flake-lock.yml @@ -0,0 +1,17 @@ +name: update-flake-lock + +on: + workflow_dispatch: + schedule: + - cron: '0 2 11 * *' + +jobs: + lockfile: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Install Nix + uses: DeterminateSystems/nix-installer-action@main + - name: Update flake.lock + uses: DeterminateSystems/update-flake-lock@main From 14c51414fde305f76cee6cf88e5e966e74b94e05 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 22 Dec 2024 17:29:30 +0100 Subject: [PATCH 5/5] nix flake update --- flake.lock | 17 +++++++++-------- flake.nix | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 291df13..558ed19 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1719877454, - "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -22,15 +22,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727174734, - "narHash": "sha256-xa3TynMF5vaWonmTOg/Ejc1Fmo0GkQnCaVRVkBc3z2I=", - "owner": "gepetto", + "lastModified": 1734714690, + "narHash": "sha256-qG7ZsWjeuhYKa8mSEVBDvEW5BPyzTV3sK6YNjXnbwXc=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ad139a0e4372abc12320c8c92ee90e0e5e296e1", + "rev": "8ca81a76ca9f378eff8c25c9db0ffb14acb33d64", "type": "github" }, "original": { - "owner": "gepetto", + "owner": "NixOS", + "ref": "refs/pull/362956/head", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 9cb7e1f..77c3c9a 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Display of hpp robots and obstacles in gepetto-viewer"; inputs = { - nixpkgs.url = "github:gepetto/nixpkgs"; + nixpkgs.url = "github:NixOS/nixpkgs/refs/pull/362956/head"; flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs";