From a433ee85d6d6368af53f7b4788d975facbfc0246 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 22 Dec 2024 17:05:31 +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 349d808796aaf6b7e3a1a1ad72a527ebf4b5262d Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 22 Dec 2024 17:06:00 +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 e79dc96b81a25fa00075f2a275d93b94ce02b5cc Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 22 Dec 2024 17:06:25 +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 7d9ab0124db2b5eda23428bc52c44c021f8f1b58 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 22 Dec 2024 17:07:21 +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..1503778 --- /dev/null +++ b/.github/workflows/update-flake-lock.yml @@ -0,0 +1,17 @@ +name: update-flake-lock + +on: + workflow_dispatch: + schedule: + - cron: '0 12 7 * *' + +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 f00e5c306e5d839a0bb3df2e8502874cfb129b34 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 22 Dec 2024 17:08:05 +0100 Subject: [PATCH 5/5] nix flake update --- flake.lock | 18 +++++++++--------- flake.nix | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 9382e47..558ed19 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -22,16 +22,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728302809, - "narHash": "sha256-yaGVx2v4C4hCoiYW3wysMl7MVcLy6++C8TxlS4sekt4=", - "owner": "gepetto", + "lastModified": 1734714690, + "narHash": "sha256-qG7ZsWjeuhYKa8mSEVBDvEW5BPyzTV3sK6YNjXnbwXc=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "1ecb77792a66a245f0c117b20d7300dbd2a20b89", + "rev": "8ca81a76ca9f378eff8c25c9db0ffb14acb33d64", "type": "github" }, "original": { - "owner": "gepetto", - "ref": "hpp", + "owner": "NixOS", + "ref": "refs/pull/362956/head", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 483f9e0..f9215c8 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Implements affordance extraction for multi-contact planning"; inputs = { - nixpkgs.url = "github:gepetto/nixpkgs/hpp"; + nixpkgs.url = "github:NixOS/nixpkgs/refs/pull/362956/head"; flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs";