Skip to content

Commit c538402

Browse files
authored
Some CI tweaks (#30)
* Build all replit packages in CI * Add hydra job for each release * Fix lint * Rebuild node-packages
1 parent 15c50a6 commit c538402

File tree

7 files changed

+5172
-22
lines changed

7 files changed

+5172
-22
lines changed

.semaphore/semaphore.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ blocks:
2828
jobs:
2929
- name: Make sure files are nixfmt'ed
3030
commands:
31-
- nixpkgs-fmt default.nix overlay.nix shell.nix
31+
- nixpkgs-fmt default.nix overlay.nix hydra
3232
- nixpkgs-fmt pkgs
3333
- name: Lint all files
3434
commands:
35-
- nix-linter default.nix overlay.nix shell.nix
35+
- nix-linter default.nix overlay.nix
3636
- find . -name "*.nix" -path "./pkgs/*" -not -path "./pkgs/node-packages/*" | xargs nix-linter
3737

3838
- name: Build overlay packages
@@ -54,4 +54,4 @@ blocks:
5454
- mkdir /tmp/$NIXPKGS_CHANNEL
5555
- sh build.sh $NIXPKGS_CHANNEL
5656
- tar -xvf $NIXPKGS_CHANNEL.tar.gz -C /tmp/$NIXPKGS_CHANNEL
57-
- nix-build /tmp/$NIXPKGS_CHANNEL/shell.nix -A buildInputs
57+
- nix-build /tmp/$NIXPKGS_CHANNEL/default.nix -A replitPackages

default.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
{ sources ? import nix/sources.nix }:
2-
import sources."nixpkgs-unstable" {overlays = [ (import ./overlay.nix) ];}
1+
{ sources ? import nix/sources.nix
2+
, channel ? sources."nixpkgs-unstable"
3+
}:
4+
import channel {overlays = [ (import ./overlay.nix) ];}

hydra/release-21.11.nix

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{}:
2+
3+
let
4+
sources = import ../nix/sources.nix;
5+
pkgs = import ../default.nix {
6+
sources = sources;
7+
channel = sources."nixpkgs-21.11";
8+
};
9+
in
10+
{
11+
inherit (pkgs) replitPackages;
12+
inherit (pkgs.nodePackages) typescript-language-server yarn prettier svelte-language-server;
13+
}

release.nix renamed to hydra/release-legacy.nix

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{}:
22

33
let
4-
5-
pkgs = import ./default.nix { };
6-
4+
sources = import ../nix/sources.nix;
5+
pkgs = import ../default.nix {
6+
sources = sources;
7+
channel = sources.nixpkgs-legacy;
8+
};
79
in
810
{
911
inherit (pkgs) replitPackages;

hydra/release-unstable.nix

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{}:
2+
3+
let
4+
sources = import ../nix/sources.nix;
5+
pkgs = import ../default.nix {
6+
sources = sources;
7+
channel = sources.nixpkgs-unstable;
8+
};
9+
in
10+
{
11+
inherit (pkgs) replitPackages;
12+
inherit (pkgs.nodePackages) typescript-language-server yarn prettier svelte-language-server;
13+
}

0 commit comments

Comments
 (0)