Skip to content

Commit 501742a

Browse files
kukkok3jmgilman
andauthored
feat: adds blueprints | NPG-000 (#741)
# Description Adds blueprint for cont snap and reverts changes to event-db schema Fixes # (issue) _if applicable_ ## Type of change Please delete options that are not relevant. - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] This change requires a documentation update ## How Has This Been Tested? Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration - [ ] Test A - [ ] Test B **Test Configuration**: _if applicable_ - Firmware version: - Hardware: - Toolchain: - SDK: **List of new dependencies**: _if applicable_ Provide a list of newly added dependencies in this PR, with the description of what are they doing and why do we need them. - Crate A: description - Crate B: description ## Checklist - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules --------- Co-authored-by: Joshua Gilman <[email protected]>
1 parent 8e40636 commit 501742a

File tree

18 files changed

+184
-236
lines changed

18 files changed

+184
-236
lines changed

.github/workflows/ci-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ jobs:
2323
- uses: actions/checkout@v4
2424

2525
- name: Install Forge
26-
uses: input-output-hk/catalyst-forge/actions/install@ci/v1.5.3
26+
uses: input-output-hk/catalyst-forge/actions/install@ci/v1.7.1
2727
with:
28-
version: 0.8.0
28+
version: 0.14.0
2929
if: always()
3030

3131
- name: Setup CI
32-
uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.5.3
32+
uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.7.1
3333

3434
- name: Run tests
35-
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.5.3
35+
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.7.1
3636
if: always()
3737
continue-on-error: true
3838
with:

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ permissions:
1010

1111
jobs:
1212
ci:
13-
uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.5.3
13+
uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.7.1
1414
with:
15-
forge_version: 0.8.1
15+
forge_version: 0.14.0

Earthfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ all:
9292
END
9393

9494
# Build and tag all Docker images
95-
BUILD ./containers/event-db-migrations+publish --tag=$tag --registry=$registry_final
95+
BUILD ./containers/event-db-migrations+package --tag=$tag --registry=$registry_final
9696

9797
# Build crate images from the workspace
9898
BUILD ./src/jormungandr/jormungandr+docker --tag=$tag --registry=$registry_final
@@ -101,7 +101,7 @@ all:
101101
BUILD ./src/voting-tools-rs+docker --tag=$tag --registry=$registry_final
102102
BUILD ./src/cat-data-service+publish --tag=$tag --registry=$registry_final
103103

104-
BUILD ./services/voting-node+publish --tag=$tag --registry=$registry_final
104+
BUILD ./services/voting-node+package --tag=$tag --registry=$registry_final
105105
BUILD ./utilities/ideascale-importer+docker --tag=$tag --registry=$registry_final
106106

107107
all-with-tags:
@@ -147,9 +147,9 @@ tag-workspace:
147147

148148
local:
149149
LOCALLY
150-
BUILD ./containers/event-db-migrations+publish
150+
BUILD ./containers/event-db-migrations+package
151151
BUILD ./src/cat-data-service+publish
152-
BUILD ./services/voting-node+publish
152+
BUILD ./services/voting-node+package
153153

154154
RUN mkdir -p ./local
155155
COPY ./containers/dev-local+build/docker-compose.yml ./local/

blueprint.cue

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
version: "1.0"
2+
global: {
3+
ci: {
4+
local: [
5+
"^check(-.*)?$",
6+
"^build(-.*)?$",
7+
"^package(-.*)?$",
8+
"^test(-.*)?$",
9+
]
10+
registries: [
11+
ci.providers.aws.ecr.registry,
12+
]
13+
providers: {
14+
aws: {
15+
region: "eu-central-1"
16+
ecr: registry: "332405224602.dkr.ecr.eu-central-1.amazonaws.com"
17+
role: "arn:aws:iam::332405224602:role/ci"
18+
}
19+
20+
docker: credentials: {
21+
provider: "aws"
22+
path: "global/ci/docker"
23+
}
24+
25+
git: credentials: {
26+
provider: "aws"
27+
path: "global/ci/deploy"
28+
}
29+
30+
earthly: {
31+
credentials: {
32+
provider: "aws"
33+
path: "global/ci/earthly"
34+
}
35+
org: "Catalyst"
36+
satellite: "ci"
37+
version: "0.8.15"
38+
}
39+
40+
github: registry: "ghcr.io"
41+
42+
kcl: {
43+
install: true
44+
version: "v0.11.0"
45+
}
46+
}
47+
secrets: [
48+
{
49+
name: "GITHUB_TOKEN"
50+
optional: true
51+
provider: "env"
52+
path: "GITHUB_TOKEN"
53+
},
54+
]
55+
}
56+
repo: {
57+
defaultBranch: "main"
58+
name: "input-output-hk/catalyst-core"
59+
}
60+
}

containers/event-db-migrations/Earthfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build:
1212
SAVE ARTIFACT ./bin/refinery refinery
1313
SAVE IMAGE --cache-hint
1414

15-
publish:
15+
package:
1616
FROM debian:stable-slim
1717
ARG tag="latest"
1818
ARG data="historic"
@@ -63,3 +63,11 @@ publish:
6363
# --load test:latest=+docker
6464
# RUN docker run test:latest
6565
# END
66+
67+
docker:
68+
FROM +package
69+
70+
ARG container='migrations'
71+
ARG tag="latest"
72+
73+
SAVE IMAGE ${container}:${tag}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
version: "1.0.0"
2+
project: {
3+
name: "event-db-migrations"
4+
release: {
5+
docker: {
6+
on: {
7+
merge: {}
8+
tag: {}
9+
}
10+
config: {
11+
tag: _ @forge(name="GIT_HASH_OR_TAG")
12+
}
13+
}
14+
}
15+
}

services/voting-node/Earthfile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ deps:
4343
# Install package dependencies without the voting_node package
4444
RUN poetry install --only main --no-root
4545
RUN poetry self add poetry-plugin-export
46-
46+
4747
# Copy the voting_node source code
4848
COPY --dir voting_node README.md ./
4949

@@ -91,7 +91,7 @@ pdoc:
9191
SAVE ARTIFACT /doc
9292

9393
# Docker image built for distribution and use in production.
94-
publish:
94+
package:
9595
FROM python:3.11-slim-bullseye
9696
ARG tag="latest"
9797

@@ -165,3 +165,11 @@ integration-test:
165165
--service leader0
166166
RUN docker-compose run leader0 echo "<<<INTEGRATION TESTING GOES HERE>>>"
167167
END
168+
169+
docker:
170+
FROM +package
171+
172+
ARG container='voting-node'
173+
ARG tag="latest"
174+
175+
SAVE IMAGE ${container}:${tag}

services/voting-node/blueprint.cue

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
version: "1.0.0"
2+
project: {
3+
name: "voting-node"
4+
release: {
5+
docker: {
6+
on: {
7+
merge: {}
8+
tag: {}
9+
}
10+
config: {
11+
tag: _ @forge(name="GIT_HASH_OR_TAG")
12+
}
13+
}
14+
}
15+
}

src/event-db/migrations/V11__reviews.sql

Lines changed: 0 additions & 106 deletions
This file was deleted.

src/event-db/migrations/V4__catalyst_id.sql

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)