Skip to content

Commit

Permalink
fix: Linting errors (#195)
Browse files Browse the repository at this point in the history
* fix lint

* fix: update ci version

* fix: cspell words
  • Loading branch information
kukkok3 authored Dec 28, 2023
1 parent fc6a204 commit cfab339
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 13 deletions.
8 changes: 8 additions & 0 deletions .config/dictionaries/project.dic
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
aarch
aapt
addrr
adminer
androidx
Expand All @@ -18,9 +19,11 @@ COCOAPODS
codepoints
coti
cryptoxide
Cunego
Cupertino
dbsync
delegators
DIND
dockerhub
dotenv
dotenvy
Expand Down Expand Up @@ -49,8 +52,10 @@ localizable
mdlint
mitigations
moderations
multidex
nanos
netkey
nextest
Oleksandr
oneshot
openapi
Expand All @@ -71,13 +76,16 @@ pubkey
pubspec
rapidoc
redoc
reqwest
ripgrep
rustc
rustls
rxdart
saibatizoku
seckey
slotno
sqlfluff
Stefano
stevenj
subosito
tacho
Expand Down
12 changes: 6 additions & 6 deletions catalyst-gateway/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ VERSION 0.7

# Set up our target toolchains, and copy our files.
builder:
FROM github.com/input-output-hk/catalyst-ci/earthly/rust:v2.0.12+rust-base
FROM github.com/input-output-hk/catalyst-ci/earthly/rust:v2.0.14+rust-base

DO github.com/input-output-hk/catalyst-ci/earthly/rust:v2.0.12+SETUP --toolchain=rust-toolchain.toml
DO github.com/input-output-hk/catalyst-ci/earthly/rust:v2.0.14+SETUP --toolchain=rust-toolchain.toml

COPY --dir .cargo .config Cargo.* clippy.toml deny.toml rustfmt.toml bin crates tests .

# Test rust build container - Use best architecture host tools.
check-hosted:
FROM +builder

DO github.com/input-output-hk/catalyst-ci/earthly/rust:v2.0.12+CHECK
DO github.com/input-output-hk/catalyst-ci/earthly/rust:v2.0.14+CHECK

# Test which runs check with all supported host tooling. Needs qemu or rosetta to run.
# Only used to validate tooling is working across host toolsets.
Expand All @@ -27,9 +27,9 @@ build-hosted:
# Build the service
FROM +builder

DO github.com/input-output-hk/catalyst-ci/earthly/rust:v2.0.12+BUILD --bins="cat-gateway/cat-gateway"
DO github.com/input-output-hk/catalyst-ci/earthly/rust:v2.0.14+BUILD --bins="cat-gateway/cat-gateway"

DO github.com/input-output-hk/catalyst-ci/earthly/rust:v2.0.12+SMOKE_TEST --bin="cat-gateway"
DO github.com/input-output-hk/catalyst-ci/earthly/rust:v2.0.14+SMOKE_TEST --bin="cat-gateway"

SAVE ARTIFACT target/$TARGETARCH/doc doc
SAVE ARTIFACT target/$TARGETARCH/release/cat-gateway cat-gateway
Expand All @@ -43,7 +43,7 @@ unit-test-hosted:
# Build the service
FROM +builder

DO github.com/input-output-hk/catalyst-ci/earthly/rust:v2.0.12+UNIT_TEST
DO github.com/input-output-hk/catalyst-ci/earthly/rust:v2.0.14+UNIT_TEST

SAVE ARTIFACT target/nextest/ci/junit.xml junit-report.xml
SAVE ARTIFACT coverage-report.info coverage-report.info
Expand Down
2 changes: 0 additions & 2 deletions catalyst-gateway/tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#cspell: words Stefano Cunego

[package]
name = "tests"
version = "0.1.0"
Expand Down
6 changes: 2 additions & 4 deletions catalyst-gateway/tests/Earthfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
VERSION 0.7

#cspell: words nextest

integration-test:
# Example of a setup for integration testing
# the cat-gatway binary will be replaced by the cat-gatway package when this will be avalaible
# the cat-gateway binary will be replaced by the cat-gateway package when this will be available

FROM ../+builder
DO github.com/earthly/lib+INSTALL_DIND
DO github.com/earthly/lib:2.2.11+INSTALL_DIND
COPY ../+build-hosted/cat-gateway .
COPY integration/docker-compose.yml .
WITH DOCKER \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//
// Integration test example
//
#[tokio::test]
Expand Down

0 comments on commit cfab339

Please sign in to comment.