Skip to content

Commit

Permalink
fix(ci): Bump earthfile versions to 0.8 and use new rust builders in …
Browse files Browse the repository at this point in the history
…cat-ci. (#483)

* fix(ci): Exclude Cargo.lock from git by default, only include it if explicitly required.

* fix(ci): Remove cargo.lock from git repo

* fix(ci): Bump earthly version to 0.8 and use new rust builders from cat-ci

* fix(ci): Sync deny.toml to vendored version

* fix(ci): Fix spelling

* fix(ci): sync with standard deny.toml from cat-ci

* fix(ci): `target` is implied in output, so don;t reference it.

* fix(ci): fix the output declaration for cat-gateway

* fix(backend): Fix cat-gateway build issues from tools upgrade

* fix(ci): Use the merged down branch

* feat(backend): Bump poem to latest current versions, and correct small issues in the code because of it.

* fix(ci): Refer to the tagged cat-ci version v3.00.0
  • Loading branch information
stevenj committed May 14, 2024
1 parent 9e0783a commit 50fa2e3
Show file tree
Hide file tree
Showing 22 changed files with 195 additions and 4,693 deletions.
1 change: 1 addition & 0 deletions .config/dictionaries/project.dic
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ vkeywitness
voteplan
voteplans
wallclock
wasmtime
Werror
xcassets
xcconfig
Expand Down
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
# Icon must end with two \r
Icon


# Thumbnails
._*

Expand Down Expand Up @@ -103,4 +102,8 @@ dev-catalyst-voice-9f78f27c6bc5.json
/docs/site/

# Rust
Cargo.lock

# By default ignore Cargo.lock
# Specifically exclude it in the directory it appears, if its required.
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Cargo.lock
17 changes: 10 additions & 7 deletions Earthfile
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
# Set the Earthly version to 0.7
VERSION 0.8

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

VERSION 0.7
FROM debian:stable-slim

# cspell: words livedocs sitedocs

# check-markdown markdown check using catalyst-ci.
check-markdown:
DO github.com/input-output-hk/catalyst-ci/earthly/mdlint:v2.11.1+CHECK
DO mdlint-ci+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.1+MDLINT_LOCALLY --src=$(echo ${PWD}) --fix=--fix
DO mdlint-ci+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.1+CHECK
DO cspell-ci+CHECK

# 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
FROM postgresql-ci+postgres-base

COPY . .

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

repo-docs:
# Create artifacts of extra files we embed inside the documentation when its built.
Expand Down
6 changes: 1 addition & 5 deletions athena/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@
debug/
target/

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Cargo.lock

# These are backup files generated by rustfmt
**/*.rs.bk

# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb
*.pdb
6 changes: 5 additions & 1 deletion catalyst-gateway/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@ target/
**/*.rs.bk

# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb
*.pdb

# Build artifacts
cat-gateway.coverage-report.info
cat-gateway.junit-report.xml
Loading

0 comments on commit 50fa2e3

Please sign in to comment.