Skip to content

Commit e452ea1

Browse files
authored
Merge branch 'main' into nightly-devshell
2 parents 62ce51c + c3ce81b commit e452ea1

File tree

10 files changed

+56
-32
lines changed

10 files changed

+56
-32
lines changed

.github/workflows/nix.yml

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,15 @@ jobs:
4242
- name: Standard Discovery
4343
uses: divnix/std-action/discover@main
4444
id: discovery
45-
publish-containers:
45+
build-packages:
4646
needs: discover
4747
strategy:
4848
fail-fast: false
4949
matrix:
50-
target: ${{ fromJSON(needs.discover.outputs.hits).containers.publish }}
50+
target: ${{ fromJSON(needs.discover.outputs.hits).packages.build }}
5151
name: ${{ matrix.target.cell }} - ${{ matrix.target.name }}
5252
runs-on: ubuntu-latest
5353
steps:
54-
- name: Configure Registry
55-
run: |
56-
aws ecr get-login-password --region eu-central-1 | docker login --username AWS --password-stdin "${{ env.ECR_REGISTRY }}"
57-
env:
58-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
59-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
60-
AWS_DEFAULT_REGION: eu-central-1
6154
- uses: divnix/std-action/run@main
6255
with:
6356
extra_nix_config: |
@@ -67,15 +60,12 @@ jobs:
6760
s3_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
6861
s3_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
6962
cache: ${{ env.S3_CACHE }}
70-
build-packages:
71-
if: always()
72-
needs:
73-
- discover
74-
- publish-containers
63+
build-devshells:
64+
needs: discover
7565
strategy:
7666
fail-fast: false
7767
matrix:
78-
target: ${{ fromJSON(needs.discover.outputs.hits).packages.build }}
68+
target: ${{ fromJSON(needs.discover.outputs.hits).devshells.build }}
7969
name: ${{ matrix.target.cell }} - ${{ matrix.target.name }}
8070
runs-on: ubuntu-latest
8171
steps:
@@ -88,18 +78,25 @@ jobs:
8878
s3_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
8979
s3_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
9080
cache: ${{ env.S3_CACHE }}
91-
build-devshells:
92-
if: always()
81+
publish-containers:
82+
if: github.ref == 'refs/heads/main'
9383
needs:
9484
- discover
95-
- publish-containers
85+
- build-packages
9686
strategy:
9787
fail-fast: false
9888
matrix:
99-
target: ${{ fromJSON(needs.discover.outputs.hits).devshells.build }}
89+
target: ${{ fromJSON(needs.discover.outputs.hits).containers.publish }}
10090
name: ${{ matrix.target.cell }} - ${{ matrix.target.name }}
10191
runs-on: ubuntu-latest
10292
steps:
93+
- name: Configure Registry
94+
run: |
95+
aws ecr get-login-password --region eu-central-1 | docker login --username AWS --password-stdin "${{ env.ECR_REGISTRY }}"
96+
env:
97+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
98+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
99+
AWS_DEFAULT_REGION: eu-central-1
103100
- uses: divnix/std-action/run@main
104101
with:
105102
extra_nix_config: |

.std/automation/devshells/dev/shell-profile

Lines changed: 0 additions & 1 deletion
This file was deleted.

.std/automation/devshells/dev/shell-profile-1-link

Lines changed: 0 additions & 1 deletion
This file was deleted.

.std/automation/devshells/dev/shell-profile-2-link

Lines changed: 0 additions & 1 deletion
This file was deleted.

.std/automation/devshells/dev/shell-profile-3-link

Lines changed: 0 additions & 1 deletion
This file was deleted.

.std/automation/devshells/dev/shell-profile-4-link

Lines changed: 0 additions & 1 deletion
This file was deleted.

.std/automation/devshells/dev/shell-profile-5-link

Lines changed: 0 additions & 1 deletion
This file was deleted.

lefthook.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

nix/vit-servicing-station/operables.nix

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,54 @@
1010
package = cell.packages.vit-servicing-station-server;
1111

1212
mkVitOperable = namespace: let
13+
# Deployment artifacts, including block0
1314
artifacts' = artifacts."artifacts-${namespace}";
15+
16+
# Configuration file contents
17+
config = l.toJSON {
18+
tls = {
19+
cert_file = null;
20+
priv_key_file = null;
21+
};
22+
cors = {
23+
max_age_secs = null;
24+
allowed_origins = [
25+
"https://${namespace}-servicing-station.vit.iohk.io"
26+
"http://127.0.0.1"
27+
];
28+
};
29+
block0_path = "${artifacts'}/block0.bin";
30+
enable_api_tokens = false;
31+
log = {
32+
log_level = "trace";
33+
};
34+
address = "0.0.0.0:8080";
35+
service_version = "";
36+
};
1437
in
1538
std.lib.ops.mkOperable {
1639
inherit package;
1740
runtimeInputs = [
1841
artifacts'
1942
];
20-
runtimeScript = std.lib.ops.mkOperableScript {
21-
inherit package;
22-
args = {
23-
"--in-settings-file" = "/local/station-config.json";
43+
runtimeScript = let
44+
configFile =
45+
nixpkgs.runCommand "vit-ss-config-${namespace}"
46+
{
47+
inherit config;
48+
passAsFile = ["config"];
49+
}
50+
''
51+
cp $configPath $out
52+
'';
53+
in
54+
std.lib.ops.mkOperableScript {
55+
inherit package;
56+
args = {
57+
"--in-settings-file" = configFile;
58+
"--service-version" = "3.4";
59+
};
2460
};
25-
};
2661
};
2762
in
2863
{}

treefmt.toml

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)