Skip to content

Commit

Permalink
Merge branch 'main' into feat/norns-endpoints-stub
Browse files Browse the repository at this point in the history
  • Loading branch information
apskhem authored Nov 17, 2024
2 parents eee866e + ca1c4f9 commit 616228f
Show file tree
Hide file tree
Showing 206 changed files with 8,486 additions and 13,767 deletions.
4 changes: 4 additions & 0 deletions .config/dictionaries/project.dic
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ drep
dreps
dtscalac
earthfile
earthlyignore
Easterling
eddsa
Edgedriver
Expand Down Expand Up @@ -319,5 +320,8 @@ xcodeproj
xctest
xctestrun
xcworkspace
xprv
xpub
xpublic
xvfb
yoroi
4 changes: 3 additions & 1 deletion .earthlyignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
**/.flutter-plugins-dependencies
**/.idea/
**/*.iml
**/Earthfile
**/coverage/
**/test_reports/
**/*.log

# node related

Expand Down
69 changes: 0 additions & 69 deletions .github/workflows/build-flutter-web.yml

This file was deleted.

7 changes: 6 additions & 1 deletion .vscode/launch.recommended.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@
"program": "lib/configs/main_web.dart",
"args": [
"--dart-define",
"SENTRY_DSN=REPLACE_WITH_SENTRY_DSN_URL"
"SENTRY_DSN=REPLACE_WITH_SENTRY_DSN_URL",
// flutter_rust_bridge: https://cjycode.com/flutter_rust_bridge/manual/miscellaneous/web-cross-origin#when-flutter-run
"--web-header",
"Cross-Origin-Opener-Policy=same-origin",
"--web-header",
"Cross-Origin-Embedder-Policy=require-corp"
]
},
{
Expand Down
6 changes: 3 additions & 3 deletions Earthfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
VERSION 0.8

IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.2.23 AS mdlint-ci
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.2.23 AS cspell-ci
IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.2.23 AS postgresql-ci
IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.2.24 AS mdlint-ci
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.2.24 AS cspell-ci
IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.2.24 AS postgresql-ci

FROM debian:stable-slim

Expand Down
2 changes: 1 addition & 1 deletion catalyst-gateway/Earthfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
VERSION 0.8

IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.23 AS rust-ci
IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.24 AS rust-ci

#cspell: words rustfmt toolsets USERARCH stdcfgs

Expand Down
2 changes: 1 addition & 1 deletion catalyst-gateway/event-db/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# the database and its associated software.
VERSION 0.8

IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.2.23 AS postgresql-ci
IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.2.24 AS postgresql-ci

# cspell: words

Expand Down
4 changes: 2 additions & 2 deletions catalyst-gateway/rustfmt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ max_width = 100

# Comments:
normalize_comments = true
normalize_doc_attributes = true
normalize_doc_attributes = false
wrap_comments = true
comment_width = 90 # small excess is okay but prefer 80
format_code_in_doc_comments = true
Expand Down Expand Up @@ -65,4 +65,4 @@ condense_wildcard_suffixes = true
hex_literal_case = "Upper"

# Ignored files:
ignore = []
ignore = []
2 changes: 1 addition & 1 deletion catalyst-gateway/tests/Earthfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION 0.8
IMPORT github.com/input-output-hk/catalyst-ci/earthly/spectral:v3.2.23 AS spectral-ci
IMPORT github.com/input-output-hk/catalyst-ci/earthly/spectral:v3.2.24 AS spectral-ci

# cspell: words oapi
# test-lint-openapi - OpenAPI linting from an artifact
Expand Down
2 changes: 1 addition & 1 deletion catalyst-gateway/tests/api_tests/Earthfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
VERSION 0.8

IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.2.23 AS python-ci
IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.2.24 AS python-ci

builder:
FROM python-ci+python-base
Expand Down
22 changes: 22 additions & 0 deletions catalyst_voices/.earthlyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Files and directories created by pub

**/.dart_tool/
**/.packages
**/build/
**/pubspec.lock
**/pubspec_overrides.yaml
**/.flutter-plugins
**/.flutter-plugins-dependencies
**/.idea/
**/*.iml
**/coverage/
**/test_reports/
**/*.log

# node related

**/node_modules/

# Rust related

**/target
20 changes: 20 additions & 0 deletions catalyst_voices/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
### Dart ###
# See https://www.dartlang.org/guides/libraries/private-files

# Generated files from code generation tools
*.g.dart
*.freezed.dart
*.chopper.dart
*.swagger.dart
*.openapi.dart
*.gen.dart

# Un-ignore generated files in public packages
!**/packages/libs/**/*.g.dart
!**/packages/libs/**/*.freezed.dart
!**/packages/libs/**/*.chopper.dart
!**/packages/libs/**/*.swagger.dart
!**/packages/libs/**/*.openapi.dart
!**/packages/libs/**/*.gen.dart

# Localization (l10n) generated files
packages/internal/catalyst_voices_localization/lib/generated/catalyst_voices_localizations_*.dart
packages/internal/catalyst_voices_localization/lib/generated/catalyst_voices_localizations.dart

# Files and directories created by pub
.dart_tool/
.packages
Expand Down
1 change: 0 additions & 1 deletion catalyst_voices/.idea/.name

This file was deleted.

Loading

0 comments on commit 616228f

Please sign in to comment.