Merge pull request #84 from nim65s/nix

update CI
humanoid-path-planner · Dec 23, 2024 · a9764a4 · a9764a4
2 parents 5abc5be + b33f72e
commit a9764a4
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+      interval: "weekly"
diff --git 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:

diff --git 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:
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
   description = "Debugging tools for the HPP project";
 
   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";
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,13 @@ name: "CI - Nix" @@
     on:
       push:
+        branches:
+          - devel
+          - master
+      pull_request:
+        branches:
+          - devel
+          - master
     jobs:
       tests:
@@ Expand Down @@