aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Update crates' (#1131) from update-crates into main

Browse Source 
Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/1131
This commit is contained in:
KitaitiMakoto 2023-01-05 16:35:11 +00:00
commit 92a8f8aa4c
8 changed files with 263 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml
View File

@ -10,7 +10,7 @@ executors:
type: boolean type: boolean
default: false default: false
docker: docker:
- image: plumeorg/plume-buildenv:v0.7.0 - image: plumeorg/plume-buildenv:v0.8.0
- image: <<#parameters.postgres>>cimg/postgres:14.2<</parameters.postgres>><<^parameters.postgres>>alpine:latest<</parameters.postgres>> - image: <<#parameters.postgres>>cimg/postgres:14.2<</parameters.postgres>><<^parameters.postgres>>alpine:latest<</parameters.postgres>>
environment: environment:
POSTGRES_USER: postgres POSTGRES_USER: postgres
@ -63,7 +63,7 @@ commands:
type: boolean type: boolean
default: false default: false
steps: steps:
- run: rustup component add clippy --toolchain nightly-2022-01-27-x86_64-unknown-linux-gnu - run: rustup component add clippy --toolchain nightly-2022-07-19-x86_64-unknown-linux-gnu
- run: cargo clippy <<^parameters.no_feature>>--no-default-features --features="${FEATURES}"<</parameters.no_feature>> --release -p <<parameters.package>> -- -D warnings - run: cargo clippy <<^parameters.no_feature>>--no-default-features --features="${FEATURES}"<</parameters.no_feature>> --release -p <<parameters.package>> -- -D warnings
run_with_coverage: run_with_coverage:
@ -112,7 +112,7 @@ jobs:
name: default name: default
steps: steps:
- restore_env - restore_env
- run: rustup component add rustfmt --toolchain nightly-2022-01-27-x86_64-unknown-linux-gnu - run: rustup component add rustfmt --toolchain nightly-2022-07-19-x86_64-unknown-linux-gnu
- run: cargo fmt --all -- --check - run: cargo fmt --all -- --check
clippy: clippy:

456
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
Cargo.toml
View File

@ -19,7 +19,7 @@ rocket = "0.4.11"
rocket_contrib = { version = "0.4.11", features = ["json"] } rocket_contrib = { version = "0.4.11", features = ["json"] }
rocket_i18n = "0.4.1" rocket_i18n = "0.4.1"
scheduled-thread-pool = "0.2.6" scheduled-thread-pool = "0.2.6"
serde = "=1.0.137" serde = "1.0.137"
serde_json = "1.0.81" serde_json = "1.0.81"
shrinkwraprs = "0.3.0" shrinkwraprs = "0.3.0"
validator = { version = "0.15", features = ["derive"] } validator = { version = "0.15", features = ["derive"] }

2
plume-api/Cargo.toml
View File

@ -5,5 +5,5 @@ authors = ["Plume contributors"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
serde = "=1.0.137" serde = "1.0.137"
serde_derive = "1.0" serde_derive = "1.0"

2
plume-common/Cargo.toml
View File

@ -11,7 +11,7 @@ hex = "0.4"
openssl = "0.10.40" openssl = "0.10.40"
rocket = "0.4.11" rocket = "0.4.11"
reqwest = { version = "0.11.11", features = ["blocking", "json", "socks"] } reqwest = { version = "0.11.11", features = ["blocking", "json", "socks"] }
serde = "=1.0.137" serde = "1.0.137"
serde_derive = "1.0" serde_derive = "1.0"
serde_json = "1.0.81" serde_json = "1.0.81"
shrinkwraprs = "0.3.0" shrinkwraprs = "0.3.0"

2
plume-front/Cargo.toml
View File

@ -15,7 +15,7 @@ gettext = "0.4.0"
gettext-macros = "0.6.1" gettext-macros = "0.6.1"
gettext-utils = "0.1.0" gettext-utils = "0.1.0"
lazy_static = "1.3" lazy_static = "1.3"
serde = "=1.0.137" serde = "1.0.137"
serde_json = "1.0" serde_json = "1.0"
wasm-bindgen = "0.2.81" wasm-bindgen = "0.2.81"
js-sys = "0.3.58" js-sys = "0.3.58"

2
plume-models/Cargo.toml
View File

@ -17,7 +17,7 @@ rocket = "0.4.11"
rocket_i18n = "0.4.1" rocket_i18n = "0.4.1"
reqwest = "0.11.11" reqwest = "0.11.11"
scheduled-thread-pool = "0.2.6" scheduled-thread-pool = "0.2.6"
serde = "=1.0.137" serde = "1.0.137"
serde_derive = "1.0" serde_derive = "1.0"
serde_json = "1.0.81" serde_json = "1.0.81"
tantivy = "0.13.3" tantivy = "0.13.3"

2
script/run_browser_test.sh
View File

@ -10,7 +10,7 @@ plm instance new -d plume-test.local -n plume-test
plm users new -n admin -N 'Admin' -e 'email@exemple.com' -p 'password' plm users new -n admin -N 'Admin' -e 'email@exemple.com' -p 'password'
plume & plume &
caddy run -config /Caddyfile & caddy run --config /Caddyfile &
until curl http://localhost:7878/test/health -f; do sleep 1; done 2>/dev/null >/dev/null until curl http://localhost:7878/test/health -f; do sleep 1; done 2>/dev/null >/dev/null