try and get CI workflow to work
This commit is contained in:
@@ -13,7 +13,7 @@ concurrency:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
dix:
|
dix:
|
||||||
runs-on: ubuntu-latest
|
runs-on: nix
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ permissions:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
dix:
|
dix:
|
||||||
runs-on: ubuntu-latest
|
runs-on: nix
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ concurrency:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
flake-check:
|
flake-check:
|
||||||
runs-on: ubuntu-latest
|
runs-on: nix
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ permissions:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
update:
|
update:
|
||||||
runs-on: ubuntu-latest
|
runs-on: nix
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ concurrency:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
lint:
|
lint:
|
||||||
runs-on: ubuntu-latest
|
runs-on: nix
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ permissions:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
scan:
|
scan:
|
||||||
runs-on: ubuntu-latest
|
runs-on: nix
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,9 @@ let
|
|||||||
inherit (dsl) mkContainer mkVm;
|
inherit (dsl) mkContainer mkVm;
|
||||||
inherit (hostInfo.paths) data secrets;
|
inherit (hostInfo.paths) data secrets;
|
||||||
|
|
||||||
|
pubSshPort = 23;
|
||||||
|
intSshPort = 23 + 8000;
|
||||||
|
|
||||||
ciRunnerData = "${data}/web/git-ci-runner";
|
ciRunnerData = "${data}/web/git-ci-runner";
|
||||||
ciRunnerSecrets = "${secrets}/ci-runner";
|
ciRunnerSecrets = "${secrets}/ci-runner";
|
||||||
in
|
in
|
||||||
@@ -17,8 +20,8 @@ in
|
|||||||
net.access = [ { to = "@internet"; } ];
|
net.access = [ { to = "@internet"; } ];
|
||||||
net.forward.tcp = [
|
net.forward.tcp = [
|
||||||
{
|
{
|
||||||
host = 23;
|
host = pubSshPort;
|
||||||
container = 8023;
|
container = intSshPort;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
svc.autoStart = true;
|
svc.autoStart = true;
|
||||||
@@ -38,7 +41,8 @@ in
|
|||||||
ROOT_URL = "https://git.floweytf.com/";
|
ROOT_URL = "https://git.floweytf.com/";
|
||||||
START_SSH_SERVER = true;
|
START_SSH_SERVER = true;
|
||||||
BUILTIN_SSH_SERVER_USER = "git";
|
BUILTIN_SSH_SERVER_USER = "git";
|
||||||
SSH_PORT = 8023;
|
SSH_PORT = pubSshPort;
|
||||||
|
SSH_LISTEN_PORT = intSshPort;
|
||||||
};
|
};
|
||||||
service.DISABLE_REGISTRATION = true;
|
service.DISABLE_REGISTRATION = true;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user