Skip to content

Commit 7104f82

Browse files
committed
update packaging
1 parent 3fad352 commit 7104f82

File tree

5 files changed

+61
-190
lines changed

5 files changed

+61
-190
lines changed

.github/workflows/nix.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: "${{ matrix.os }}-latest"
1818
strategy:
1919
matrix:
20-
os: [ubuntu, macos]
20+
os: [ubuntu]
2121
steps:
2222
- uses: actions/checkout@v6
2323
- uses: cachix/install-nix-action@v31
@@ -26,6 +26,7 @@ jobs:
2626
name: gepetto
2727
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
2828
- run: nix flake check -L
29+
- run: nix build -L
2930
check:
3031
if: always()
3132
name: check-macos-linux-nix

.github/workflows/update-flake-lock.yml

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,28 @@ on:
66
- cron: '0 19 23 * *'
77

88
jobs:
9-
lockfile:
10-
runs-on: ubuntu-latest
9+
update-flake-inputs:
10+
runs-on: ubuntu-slim
11+
permissions:
12+
contents: write
13+
pull-requests: write
1114
steps:
15+
- name: Generate GitHub App Token
16+
id: app-token
17+
uses: actions/create-github-app-token@v2
18+
with:
19+
app-id: ${{ secrets.GEPETTO_NIX_APP_ID }}
20+
private-key: ${{ secrets.GEPETTO_NIX_APP_PRIVATE_KEY }}
1221
- name: Checkout repository
1322
uses: actions/checkout@v6
14-
- name: Install Nix
15-
uses: DeterminateSystems/nix-installer-action@main
16-
- name: Update flake.lock
17-
uses: DeterminateSystems/update-flake-lock@main
1823
with:
19-
token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
24+
token: ${{ steps.app-token.outputs.token }}
25+
- name: Setup Nix
26+
uses: cachix/install-nix-action@v31
27+
- name: Update flake inputs
28+
uses: mic92/update-flake-inputs@v1
29+
with:
30+
github-token: ${{ steps.app-token.outputs.token }}
31+
pr-labels: 'no-changelog'
32+
git-author-name: 'hrp2-14'
33+
git-author-email: '40568249+hrp2-14@users.noreply.github.com'

.mergify.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ pull_request_rules:
55
- check-success = "pre-commit.ci - pr"
66
- or:
77
- author = dependabot[bot]
8+
- author = gepetto-flake-updater[bot]
89
- author = github-actions[bot]
910
- author = hrp2-14
1011
- author = pre-commit-ci[bot]

flake.lock

Lines changed: 22 additions & 158 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,27 @@
1414
outputs =
1515
inputs:
1616
inputs.flake-parts.lib.mkFlake { inherit inputs; } (
17-
{ lib, self, ... }:
17+
{ lib, ... }:
1818
{
1919
systems = import inputs.systems;
2020
imports = [
2121
inputs.gepetto.flakeModule
22-
{ gepetto-pkgs.overlays = [ self.overlays.default ]; }
23-
];
24-
flake.overlays.default = _final: prev: {
25-
hpp-bezier-com-traj = prev.hpp-bezier-com-traj.overrideAttrs {
26-
src = lib.fileset.toSource {
27-
root = ./.;
28-
fileset = lib.fileset.unions [
29-
./CMakeLists.txt
30-
./include
31-
./package.xml
32-
./python
33-
./src
34-
./tests
35-
];
36-
};
37-
};
38-
};
39-
perSystem =
40-
{ pkgs, self', ... }:
4122
{
42-
packages = {
43-
default = self'.packages.hpp-bezier-com-traj;
44-
hpp-bezier-com-traj = pkgs.python3Packages.hpp-bezier-com-traj;
23+
gazebros2nix.overrides.hpp-bezier-com-traj = _final: {
24+
src = lib.fileset.toSource {
25+
root = ./.;
26+
fileset = lib.fileset.unions [
27+
./CMakeLists.txt
28+
./include
29+
./package.xml
30+
./python
31+
./src
32+
./tests
33+
];
34+
};
4535
};
46-
};
36+
}
37+
];
4738
}
4839
);
4940
}

0 commit comments

Comments
 (0)