Skip to content

Commit

Permalink
Update readme. Remove openapi.json and adjust workflows. (#26)
Browse files Browse the repository at this point in the history
* readme-fix: remove warning about cli tool. Update version in docker-compose.yml to match.

* Updated readme.md. Fully remove openapi.json. Remove version cmp beteen Cargo.toml and openapi.json. Added openapi.josn to gitignore.
  • Loading branch information
clowzed authored Oct 4, 2024
1 parent 7214330 commit 782d8e4
Show file tree
Hide file tree
Showing 6 changed files with 1,240 additions and 1,257 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: "Test"
on:
push:
branches:
- "dev" # matches every branch
- "dev"

jobs:
push-to-registry:
Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,24 +46,6 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: "Get version from Cargo.toml"
id: "get-cargo-version"
shell: "bash"
run: |
echo PKG_VERSION=$(awk -F ' = ' '$1 ~ /version/ { gsub(/["]/, "", $2); printf("%s",$2) }' Cargo.toml) >> $GITHUB_OUTPUT
- name: Get version from openapi.json
id: get-openapi-version
run: |
echo OAPI_VERSION=$(jq -r '.info.version' openapi.json) >> $GITHUB_OUTPUT
- name: Compare versions
run: |
if [ "${{ steps.get-cargo-version.outputs.PKG_VERSION }}" != "${{ steps.get-openapi-version.outputs.OAPI_VERSION }}" ]; then
echo "Version mismatch between cargo.toml and generated OpenAPI JSON."
exit 1
else
echo "Version matches between cargo.toml and generated OpenAPI JSON."
fi
- name: Run tests (with database service)
run: cargo test --verbose -- --test-threads=1

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ sites-uploads
logs
test_upload_files
.env
openapi.json
38 changes: 19 additions & 19 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sero"
version = "0.2.7"
version = "0.2.8"
edition = "2021"
authors = ["clowzed <[email protected]>"]
description = "Muiltidomain static site hosting"
Expand All @@ -11,19 +11,19 @@ license = "MIT"
[dependencies]
envy = "0.4.2"
sea-orm = { version = "0.12.3", features = [
"sqlx-postgres",
"runtime-tokio-rustls",
"macros",
"sqlx-postgres",
"runtime-tokio-rustls",
"macros",
] }
tokio = { version = "1.32.0", features = ["full"] }
tokio-postgres = "0.7.10"
tracing = { version = "0.1.37", features = ["async-await"] }
tracing-subscriber = { version = "0.3.17", features = [
"env-filter",
"fmt",
"ansi",
"std",
"json",
"env-filter",
"fmt",
"ansi",
"std",
"json",
] }
entity = { path = "entity" }
migration = { path = "migration" }
Expand All @@ -41,9 +41,9 @@ mime = "0.3.17"
mime_guess = "2.0.4"
argon2 = { version = "0.5.3", features = ["std"] }
utoipa = { version = "4.2.0", features = [
"axum_extras",
"chrono",
"preserve_order",
"axum_extras",
"chrono",
"preserve_order",
] }
dotenvy = "0.15.7"
toml = "0.8.8"
Expand All @@ -52,16 +52,16 @@ utoipa-rapidoc = { version = "4.0.0", features = ["axum"] }
utoipa-redoc = { version = "4.0.0", features = ["axum"] }
utoipa-swagger-ui = { version = "7.1.0", features = ["axum"] }
axum = { version = "0.7.4", features = [
"macros",
"tracing",
"json",
"multipart",
"macros",
"tracing",
"json",
"multipart",
] }
axum_typed_multipart = "0.11.0"
tower-http = { git = "https://github.com/tower-rs/tower-http.git", features = [
"cors",
"trace",
"timeout",
"cors",
"trace",
"timeout",
] }
tower = { version = "0.4.13", features = ["util"] }
hyper = "0.14.28"
Expand Down
Loading

0 comments on commit 782d8e4

Please sign in to comment.