Skip to content

Commit

Permalink
Merge branch 'devel' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Dec 4, 2024
2 parents e91eb1b + acda16d commit 89c5d9b
Show file tree
Hide file tree
Showing 6 changed files with 133 additions and 6 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
13 changes: 11 additions & 2 deletions .github/workflows/ci-linux-ros.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
name: CI - Linux - ROS
on: [push, pull_request]

on:
push:
branches:
- master
- devel
pull_request:
branches:
- master
- devel

jobs:
CI:
ROS:
strategy:
matrix:
env:
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: "CI - Nix"

on:
push:

jobs:
nix:
runs-on: "${{ matrix.os }}-latest"
strategy:
matrix:
os: [ubuntu, macos]
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v27
- uses: cachix/cachix-action@v15
with:
name: gepetto
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- run: nix build -L
9 changes: 5 additions & 4 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
pull_request_rules:
- name: merge automatically when CI passes and PR is approved
conditions:
- check-success = "CI (humble)"
- check-success = "CI (iron)"
- check-success = "CI (jazzy)"
- check-success = "CI (rolling)"
- check-success = "ROS (humble)"
- check-success = "ROS (iron)"
- check-success = "ROS (jazzy)"
- check-success = "ROS (rolling)"
- check-success = "nix (macos)"
- check-success = "nix (ubuntu)"
- check-success = "gitlab-ci"
- check-success = "pre-commit.ci - pr"
- or:
- author = pre-commit-ci[bot]
Expand Down
58 changes: 58 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
description = "C++ reimplementation of eiquadprog";

inputs = {
flake-parts.url = "github:hercules-ci/flake-parts";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
};

outputs =
inputs:
inputs.flake-parts.lib.mkFlake { inherit inputs; } {
systems = inputs.nixpkgs.lib.systems.flakeExposed;
perSystem =
{ pkgs, self', ... }:
{
devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; };
packages = {
default = self'.packages.eiquadprog;
eiquadprog = pkgs.eiquadprog.overrideAttrs (_: {
src = pkgs.lib.fileset.toSource {
root = ./.;
fileset = pkgs.lib.fileset.unions [
./CMakeLists.txt
./include
./package.xml
./src
./tests
];
};
});
};
};
};
}

0 comments on commit 89c5d9b

Please sign in to comment.