Skip to content

Commit

Permalink
Temporarily build all hosts on CI on branch so MongoDB can maybe build
Browse files Browse the repository at this point in the history
  • Loading branch information
ethnt committed Oct 20, 2024
1 parent b8cfc5e commit 0d539b5
Show file tree
Hide file tree
Showing 14 changed files with 45 additions and 19 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,4 @@ jobs:
- omnibus
name: Build
'on':
push:
branches:
- main
push: {}
23 changes: 20 additions & 3 deletions flake.lock

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

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

nixpkgs-24-05.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-master.url = "github:NixOS/nixpkgs";

flake-parts.url = "github:hercules-ci/flake-parts";
Expand Down
2 changes: 1 addition & 1 deletion hosts/builder/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@
};
};

system.stateVersion = "23.11";
system.stateVersion = "24.05";
}
2 changes: 1 addition & 1 deletion hosts/controller/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@
};
};

system.stateVersion = "23.11";
system.stateVersion = "24.05";
}
2 changes: 1 addition & 1 deletion hosts/htpc/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@
e10.services.backup.jobs.system.exclude =
[ "/var/lib/sabnzbd/downloads" "/var/lib/plex/transcodes" ];

system.stateVersion = "23.11";
system.stateVersion = "24.05";
}
2 changes: 1 addition & 1 deletion hosts/matrix/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@

e10.services.backup.jobs.system.paths = lib.mkAfter [ "/var/www" ];

system.stateVersion = "23.11";
system.stateVersion = "24.05";
}
2 changes: 1 addition & 1 deletion hosts/monitor/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@
};
};

system.stateVersion = "23.11";
system.stateVersion = "24.05";
}
2 changes: 1 addition & 1 deletion hosts/omnibus/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,5 @@
bash -c "sudo sysctl kernel.task_delayacct=1 && sudo ${pkgs.iotop}/bin/iotop ; sudo sysctl kernel.task_delayacct=0"
'';

system.stateVersion = "23.11";
system.stateVersion = "24.05";
}
2 changes: 1 addition & 1 deletion hosts/satellite/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@
services.tailscale.extraUpFlags =
lib.mkAfter [ "--advertise-exit-node" "--advertise-routes=192.168.0.0/16" ];

system.stateVersion = "23.11";
system.stateVersion = "24.05";
}
3 changes: 2 additions & 1 deletion modules/development/ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ in {

buildWorkflow = {
name = "Build";
on.push.branches = [ "main" ];
# on.push.branches = [ "main" ];
on.push = { };
jobs = {
buildSystem = {
name = "Build system";
Expand Down
12 changes: 11 additions & 1 deletion modules/overlays/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,18 @@

config.allowUnfree = true;
};

nixpkgs-24-05 = import inputs.nixpkgs-24-05 {
inherit system;

config.allowUnfree = true;
};
in {
inherit (nixpkgs-master) prowlarr radarr sabnzbd sonarr;
inherit (nixpkgs-master) prowlarr radarr sabnzbd sonarr netbox;
inherit (nixpkgs-master.python312Packages) pymdown-extensions;

inherit (nixpkgs-24-05) prometheus-pve-exporter;

inherit (self'.packages) overseerr;
};
};
Expand Down
4 changes: 2 additions & 2 deletions modules/profiles/networking/unifi.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
services.unifi = {
enable = true;
openFirewall = true;
unifiPackage = pkgs.unifi8;
mongodbPackage = pkgs.mongodb-7_0;
unifiPackage = pkgs.unifi;
mongodbPackage = pkgs.mongodb-6_0;
};

networking.firewall = {
Expand Down
2 changes: 1 addition & 1 deletion modules/profiles/services/netbox/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

services.netbox = {
enable = true;
package = pkgs.netbox_3_7;
package = pkgs.netbox;
settings = {
CSRF_TRUSTED_ORIGINS = [
"https://netbox.e10.camp"
Expand Down

0 comments on commit 0d539b5

Please sign in to comment.