Skip to content

Commit

Permalink
Merge branch 'main' into feat/chain-sync-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
stevenj committed Sep 24, 2024
2 parents 343b77c + d972a97 commit 0bc72a4
Show file tree
Hide file tree
Showing 69 changed files with 2,267 additions and 177 deletions.
1 change: 1 addition & 0 deletions .config/dictionaries/project.dic
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
aapt
aarch
abnf
addr
addrr
adminer
afinet
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@ permissions:

jobs:
ci:
uses: input-output-hk/catalyst-ci/.github/workflows/ci.yml@master
uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@master
with:
aws_ecr_registry: 332405224602.dkr.ecr.eu-central-1.amazonaws.com
aws_role_arn: arn:aws:iam::332405224602:role/ci
aws_region: eu-central-1
secrets:
dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
earthly_runner_address: ${{ secrets.EARTHLY_SATELLITE_ADDRESS }}
earthly_runner_secret: ${{ secrets.EARTHLY_RUNNER_SECRET }}
forge_version: latest
2 changes: 1 addition & 1 deletion .github/workflows/nightly-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
if: always()
continue-on-error: true
with:
earthfile: ./catalyst_voices_packages/catalyst_cardano/catalyst_cardano/test/wallet-automation/
earthfile: ./catalyst_voices_packages/catalyst_cardano/catalyst_cardano/wallet-automation/
flags: --allow-privileged
targets: nightly-test
target_flags:
Expand Down
51 changes: 51 additions & 0 deletions blueprint.cue
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
version: "1.0"
global: {
ci: {
local: [
"^check(-.*)?$",
"^build(-.*)?$",
"^package(-.*)?$",
"^test(-.*)?$",
"^release(-.*)?$",
"^publish(-.*)?$",
]
registries: [
ci.providers.aws.registry,
]
providers: {
aws: {
region: "eu-central-1"
registry: "332405224602.dkr.ecr.eu-central-1.amazonaws.com"
role: "arn:aws:iam::332405224602:role/ci"
}

docker: credentials: {
provider: "aws"
path: "global/ci/docker"
}

earthly: {
credentials: {
provider: "aws"
path: "global/ci/earthly"
}
org: "Catalyst"
satellite: "ci"
version: "0.8.15"
}

github: registry: "ghcr.io"
}
secrets: [
{
name: "GITHUB_TOKEN"
optional: true
provider: "env"
path: "GITHUB_TOKEN"
},
]
tagging: {
strategy: "commit"
}
}
}
2 changes: 2 additions & 0 deletions catalyst-gateway/blueprint.cue
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
version: "1.0.0"
project: name: "gateway"
2 changes: 2 additions & 0 deletions catalyst-gateway/event-db/blueprint.cue
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
version: "1.0.0"
project: name: "gateway-event-db"
2 changes: 2 additions & 0 deletions catalyst-gateway/tests/api_tests/blueprint.cue
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
version: "1.0.0"
project: name: "gateway-api-tests"
2 changes: 2 additions & 0 deletions catalyst-gateway/tests/blueprint.cue
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
version: "1.0.0"
project: name: "catalyst-gateway-tests"
2 changes: 2 additions & 0 deletions catalyst-gateway/tests/schemathesis_tests/blueprint.cue
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
version: "1.0.0"
project: name: "gateway-schema-tests"
13 changes: 10 additions & 3 deletions catalyst_voices/Earthfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION 0.8

IMPORT ../catalyst-gateway AS catalyst-gateway
IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.04 AS flutter-ci
IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.2.06 AS flutter-ci

# Copy all the necessary files and running bootstrap
builder:
Expand Down Expand Up @@ -52,6 +52,11 @@ check-package-publishing:
FROM +builder
DO flutter-ci+PUBLISH_DRY_RUN

# Runs the license checks for Catalyst Voices.
check-license:
FROM +builder
RUN melos run license-check

# Run unit tests
test-unit:
FROM +builder
Expand Down Expand Up @@ -83,6 +88,8 @@ package:

publish:
FROM +package
ARG tag='latest'

SAVE IMAGE voices-frontend:$tag
ARG container="voices"
ARG tag="latest"

SAVE IMAGE ${container}:${tag}
2 changes: 2 additions & 0 deletions catalyst_voices/blueprint.cue
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
version: "1.0.0"
project: name: "voices"
8 changes: 4 additions & 4 deletions catalyst_voices/lib/dependency/dependencies.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ final class Dependencies extends DependencyProvider {
void _registerRepositories() {
this
..registerSingleton<CredentialsStorageRepository>(
CredentialsStorageRepository(secureStorageService: get()),
CredentialsStorageRepository(storage: get()),
)
..registerSingleton<AuthenticationRepository>(
AuthenticationRepository(credentialsStorageRepository: get()),
);
}

void _registerServices() {
registerSingleton<SecureStorageService>(
SecureStorageService(),
);
registerSingleton<Storage>(const SecureStorage());
registerSingleton<Vault>(const SecureStorageVault());
registerSingleton<DummyAuthStorage>(const SecureDummyAuthStorage());
}
}
Loading

0 comments on commit 0bc72a4

Please sign in to comment.