Skip to content

Commit

Permalink
Merge branch 'main' into feat/collect-flutter-code-coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
dtscalac committed Apr 12, 2024
2 parents 39ce401 + 19e3714 commit d0f66b2
Show file tree
Hide file tree
Showing 66 changed files with 8,421 additions and 487 deletions.
16 changes: 10 additions & 6 deletions .config/dictionaries/project.dic
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ cfbundle
chromedriver
chrono
ciphertext
CIPs
COCOAPODS
codegen
codepoints
Expand All @@ -48,7 +49,6 @@ Edgedriver
emurgo
encryptor
endfunction
endfunction
fetchval
fmtchk
fmtfix
Expand Down Expand Up @@ -86,6 +86,9 @@ lintfix
localizable
loguru
mdlint
metadatum
metadatums
metamap
mgrybyk
mithril
mitigations
Expand Down Expand Up @@ -120,6 +123,8 @@ pubspec
pytest
rapidoc
redoc
Replayability
repr
reqwest
rfwtxt
ripgrep
Expand All @@ -140,6 +145,7 @@ slotno
sqlfluff
Stefano
stevenj
Subkey
subosito
SYSROOT
tacho
Expand All @@ -156,13 +162,14 @@ Traceback
TXNZD
Typer
unmanaged
UTXO
utxo
Utxos
UTXO
utxos
Utxos
vite
vitss
vkey
vkeywitness
voteplan
voteplans
wallclock
Expand All @@ -176,6 +183,3 @@ xctest
xctestrun
xcworkspace
yoroi
cbor
metamap
repr
1 change: 1 addition & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"rust-lang.rust-analyzer",
"JScearcy.rust-doc-viewer",
"serayuzgur.crates",
"anweiss.cddl-languageserver",
"tintinweb.graphviz-interactive-preview",
"terrastruct.d2"
]
Expand Down
23 changes: 11 additions & 12 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,32 @@ FROM debian:stable-slim

# check-markdown markdown check using catalyst-ci.
check-markdown:
DO github.com/input-output-hk/catalyst-ci/earthly/mdlint:v2.11.0+CHECK
DO github.com/input-output-hk/catalyst-ci/earthly/mdlint:v2.11.1+CHECK

# markdown-check-fix markdown check and fix using catalyst-ci.
markdown-check-fix:
LOCALLY

DO github.com/input-output-hk/catalyst-ci/earthly/mdlint:v2.11.0+MDLINT_LOCALLY --src=$(echo ${PWD}) --fix=--fix
DO github.com/input-output-hk/catalyst-ci/earthly/mdlint:v2.11.1+MDLINT_LOCALLY --src=$(echo ${PWD}) --fix=--fix

# check-spelling Check spelling in this repo inside a container.
check-spelling:
DO github.com/input-output-hk/catalyst-ci/earthly/cspell:v2.11.0+CHECK
DO github.com/input-output-hk/catalyst-ci/earthly/cspell:v2.11.1+CHECK

repo-docs:
# Create artifacts of extra files we embed inside the documentation when its built.
FROM scratch
# check if the sql files are properly formatted and pass lint quality checks.
check-sqlfluff:
FROM github.com/input-output-hk/catalyst-ci/earthly/postgresql:v2.11.1+postgres-base

WORKDIR /repo
COPY --dir *.md LICENSE-APACHE LICENSE-MIT .
COPY . .

SAVE ARTIFACT /repo repo
DO github.com/input-output-hk/catalyst-ci/earthly/postgresql:v2.11.1+CHECK

repo-config:
# Create artifacts of config file we need to refer to in builders.
repo-docs:
# Create artifacts of extra files we embed inside the documentation when its built.
FROM scratch

WORKDIR /repo
COPY --dir .sqlfluff .
COPY --dir *.md LICENSE-APACHE LICENSE-MIT .

SAVE ARTIFACT /repo repo

Expand Down
40 changes: 39 additions & 1 deletion catalyst-gateway/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion catalyst-gateway/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,11 @@ local-ip-address = "0.5.7"
gethostname = "0.4.3"
hex = "0.4.3"
async-recursion = "1.0.5"
pallas = { git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "fix/immutable-secondary", version = "0.24.0" }
handlebars = "5.1.2"
anyhow = "1.0.71"
cddl = "0.9.2"
ciborium = "0.2"
pallas = { git = "https://github.com/input-output-hk/catalyst-pallas.git", branch = "fix/immutable-secondary", version = "0.24.0" }
cardano-chain-follower= { git = "https://github.com/input-output-hk/hermes.git", version="0.0.1" }

[workspace.lints.rust]
Expand Down
2 changes: 1 addition & 1 deletion catalyst-gateway/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ VERSION --try --global-cache 0.7

# Set up our target toolchains, and copy our files.
builder:
DO github.com/input-output-hk/catalyst-ci/earthly/rust:v2.11.0+SETUP
DO github.com/input-output-hk/catalyst-ci/earthly/rust:v2.11.1+SETUP

COPY --dir .cargo .config Cargo.* clippy.toml deny.toml rustfmt.toml bin crates .
COPY --dir ./event-db/queries ./event-db/queries
Expand Down
5 changes: 3 additions & 2 deletions catalyst-gateway/bin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,6 @@ async-recursion = { workspace = true }
pallas = { workspace = true }
cardano-chain-follower= { workspace = true }
anyhow = { workspace = true }
cddl = "0.9.2"
ciborium = "0.2"
handlebars = { workspace = true }
cddl = { workspace = true }
ciborium = { workspace = true }
119 changes: 0 additions & 119 deletions catalyst-gateway/bin/src/event_db/follower.rs

This file was deleted.

0 comments on commit d0f66b2

Please sign in to comment.