Skip to content

Commit 89c5d9b

Browse files
authored
Merge branch 'devel' into pre-commit-ci-update-config
2 parents e91eb1b + acda16d commit 89c5d9b

File tree

6 files changed

+133
-6
lines changed

6 files changed

+133
-6
lines changed

.github/dependabot.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

.github/workflows/ci-linux-ros.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
name: CI - Linux - ROS
2-
on: [push, pull_request]
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- devel
8+
pull_request:
9+
branches:
10+
- master
11+
- devel
312

413
jobs:
5-
CI:
14+
ROS:
615
strategy:
716
matrix:
817
env:

.github/workflows/nix.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: "CI - Nix"
2+
3+
on:
4+
push:
5+
6+
jobs:
7+
nix:
8+
runs-on: "${{ matrix.os }}-latest"
9+
strategy:
10+
matrix:
11+
os: [ubuntu, macos]
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: cachix/install-nix-action@v27
15+
- uses: cachix/cachix-action@v15
16+
with:
17+
name: gepetto
18+
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
19+
- run: nix build -L

.mergify.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
pull_request_rules:
22
- name: merge automatically when CI passes and PR is approved
33
conditions:
4-
- check-success = "CI (humble)"
5-
- check-success = "CI (iron)"
6-
- check-success = "CI (jazzy)"
7-
- check-success = "CI (rolling)"
4+
- check-success = "ROS (humble)"
5+
- check-success = "ROS (iron)"
6+
- check-success = "ROS (jazzy)"
7+
- check-success = "ROS (rolling)"
88
- check-success = "nix (macos)"
99
- check-success = "nix (ubuntu)"
10+
- check-success = "gitlab-ci"
1011
- check-success = "pre-commit.ci - pr"
1112
- or:
1213
- author = pre-commit-ci[bot]

flake.lock

+58
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
description = "C++ reimplementation of eiquadprog";
3+
4+
inputs = {
5+
flake-parts.url = "github:hercules-ci/flake-parts";
6+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
7+
};
8+
9+
outputs =
10+
inputs:
11+
inputs.flake-parts.lib.mkFlake { inherit inputs; } {
12+
systems = inputs.nixpkgs.lib.systems.flakeExposed;
13+
perSystem =
14+
{ pkgs, self', ... }:
15+
{
16+
devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; };
17+
packages = {
18+
default = self'.packages.eiquadprog;
19+
eiquadprog = pkgs.eiquadprog.overrideAttrs (_: {
20+
src = pkgs.lib.fileset.toSource {
21+
root = ./.;
22+
fileset = pkgs.lib.fileset.unions [
23+
./CMakeLists.txt
24+
./include
25+
./package.xml
26+
./src
27+
./tests
28+
];
29+
};
30+
});
31+
};
32+
};
33+
};
34+
}

0 commit comments

Comments
 (0)