chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate ruma-identifiers

Browse Source
This commit is contained in:
Jonas Platte 2020-06-07 17:26:33 +02:00
parent b1193a2883
commit 7a6264e0ff
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
14 changed files with 34 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.builds/beta.yml
View File

@ -24,4 +24,14 @@ tasks:
cargo test --all --verbose
test_exit=$?
exit $(( $fmt_exit || $clippy_exit || $test_exit ))
# ruma-identifiers has a bunch of features. Make sure it works both with
# all of them and none of them being enabled.
cd ruma-identifiers
cargo test --no-default-features --verbose
id_test_1_exit=$?
cargo test --all-features --verbose
id_test_2_exit=$?
exit $(( $fmt_exit || $clippy_exit || $test_exit || $id_test_1_exit || $id_test_2_exit ))

12
.builds/stable.yml
View File

@ -24,6 +24,16 @@ tasks:
cargo test --all --verbose
test_exit=$?
exit $(( $fmt_exit || $clippy_exit || $test_exit ))
# ruma-identifiers has a bunch of features. Make sure it works both with
# all of them and none of them being enabled.
cd ruma-identifiers
cargo test --no-default-features --verbose
id_test_1_exit=$?
cargo test --all-features --verbose
id_test_2_exit=$?
exit $(( $fmt_exit || $clippy_exit || $test_exit || $id_test_1_exit || $id_test_2_exit ))
# TODO: Add audit task once cargo-audit binary releases are available.
# See https://github.com/RustSec/cargo-audit/issues/66

6
Cargo.toml
View File

@ -1,2 +1,8 @@
[workspace]
members = ["ruma", "ruma-*"]
# Required until ruma-events becomes part of the workspace
[patch.crates-io]
ruma-common = { path = "ruma-common" }
ruma-identifiers = { path = "ruma-identifiers" }
ruma-serde = { path = "ruma-serde" }

2
ruma-api/Cargo.toml
View File

@ -19,7 +19,7 @@ edition = "2018"
http = "0.2.1"
percent-encoding = "2.1.0"
ruma-api-macros = { version = "=0.16.1", path = "../ruma-api-macros" }
ruma-identifiers = "0.16.2"
ruma-identifiers = { version = "0.16.2", path = "../ruma-identifiers" }
ruma-serde = { version = "0.2.0", path = "../ruma-serde" }
serde = { version = "1.0.111", features = ["derive"] }
serde_json = "1.0.53"

2
ruma-appservice-api/Cargo.toml
View File

@ -14,7 +14,7 @@ edition = "2018"
[dependencies]
ruma-api = "0.16.1"
ruma-events = { git = "https://github.com/ruma/ruma-events", rev = "c1ee72d" }
ruma-identifiers = "0.16.2"
ruma-identifiers = { version = "0.16.2", path = "../ruma-identifiers" }
serde = { version = "1.0.111", features = ["derive"] }
serde_json = "1.0.52"
url = { version = "2.1.1", features = ["serde"] }

2
ruma-client-api/Cargo.toml
View File

@ -22,7 +22,7 @@ js_int = { version = "0.1.5", features = ["serde"] }
ruma-api = { version = "0.16.1", path = "../ruma-api" }
ruma-common = { version = "0.1.3", path = "../ruma-common" }
ruma-events = { git = "https://github.com/ruma/ruma-events", rev = "c1ee72d" }
ruma-identifiers = "0.16.2"
ruma-identifiers = { version = "0.16.2", path = "../ruma-identifiers" }
ruma-serde = { version = "0.2.2", path = "../ruma-serde" }
serde = { version = "1.0.111", features = ["derive"] }
serde_json = "1.0.53"

2
ruma-federation-api/Cargo.toml
View File

@ -20,7 +20,7 @@ js_int = "0.1.5"
matches = "0.1.8"
ruma-api = { version = "0.16.1", path = "../ruma-api" }
ruma-events = { git = "https://github.com/ruma/ruma-events", rev = "c1ee72d" }
ruma-identifiers = "0.16.2"
ruma-identifiers = { version = "0.16.2", path = "../ruma-identifiers" }
ruma-serde = "0.2.2"
serde = { version = "1.0.111", features = ["derive"] }
serde_json = "1.0.53"

30
ruma-identifiers/.builds/beta.yml
View File

@ -1,30 +0,0 @@
image: archlinux
packages:
- rustup
sources:
- https://github.com/ruma/ruma-identifiers
tasks:
- rustup: |
# We specify --profile minimal because we'd otherwise download docs
rustup toolchain install beta --profile minimal -c rustfmt -c clippy
rustup default beta
- test: |
cd ruma-identifiers
# We don't want the build to stop on individual failure of independent
# tools, so capture tool exit codes and set the task exit code manually
set +e
cargo fmt -- --check
fmt_exit=$?
cargo clippy --all-targets --all-features -- -D warnings
clippy_exit=$?
cargo test --no-default-features --verbose
test1_exit=$?
cargo test --all-features --verbose
test2_exit=$?
exit $(( $fmt_exit || $clippy_exit || $test1_exit || $test2_exit ))

26
ruma-identifiers/.builds/msrv.yml
View File

@ -1,26 +0,0 @@
image: archlinux
packages:
- rustup
sources:
- https://github.com/ruma/ruma-identifiers
tasks:
- rustup: |
# We specify --profile minimal because we'd otherwise download docs
rustup toolchain install 1.42.0 --profile minimal
rustup default 1.42.0
- test: |
cd ruma-identifiers
# We don't want the build to stop on individual failure of independent
# tools, so capture tool exit codes and set the task exit code manually
set +e
# Only make sure the code builds with the MSRV. Tests can require later
# Rust versions, don't compile or run them.
cargo build --no-default-features --verbose
build1_exit=$?
cargo build --all-features --verbose
build2_exit=$?
exit $(( $build1_exit || $build2_exit ))

32
ruma-identifiers/.builds/nightly.yml
View File

@ -1,32 +0,0 @@
image: archlinux
packages:
- rustup
sources:
- https://github.com/ruma/ruma-identifiers
tasks:
- rustup: |
rustup toolchain install nightly --profile minimal
rustup default nightly
# Try installing rustfmt & clippy for nightly, but don't fail the build
# if they are not available
rustup component add rustfmt || true
rustup component add clippy || true
- test: |
cd ruma-identifiers
# We don't want the build to stop on individual failure of independent
# tools, so capture tool exit codes and set the task exit code manually
set +e
if ( rustup component list | grep -q rustfmt ); then
cargo fmt -- --check
fi
fmt_exit=$?
if ( rustup component list | grep -q clippy ); then
cargo clippy --all-targets --all-features -- -D warnings
fi
clippy_exit=$?
exit $(( $fmt_exit || $clippy_exit ))

32
ruma-identifiers/.builds/stable.yml
View File

@ -1,32 +0,0 @@
image: archlinux
packages:
- rustup
sources:
- https://github.com/ruma/ruma-identifiers
tasks:
- rustup: |
# We specify --profile minimal because we'd otherwise download docs
rustup toolchain install stable --profile minimal -c rustfmt -c clippy
rustup default stable
- test: |
cd ruma-identifiers
# We don't want the build to stop on individual failure of independent
# tools, so capture tool exit codes and set the task exit code manually
set +e
cargo fmt -- --check
fmt_exit=$?
cargo clippy --all-targets --all-features -- -D warnings
clippy_exit=$?
cargo test --no-default-features --verbose
test1_exit=$?
cargo test --all-features --verbose
test2_exit=$?
exit $(( $fmt_exit || $clippy_exit || $test1_exit || $test2_exit ))
# TODO: Add audit task once cargo-audit binary releases are available.
# See https://github.com/RustSec/cargo-audit/issues/66

2
ruma-identifiers/.gitignore vendored
View File

@ -1,2 +0,0 @@
Cargo.lock
/target

2
ruma-identifiers/Cargo.toml
View File

@ -9,7 +9,7 @@ license = "MIT"
name = "ruma-identifiers"
readme = "README.md"
repository = "https://github.com/ruma/ruma-identifiers"
version = "0.16.1"
version = "0.16.2"
edition = "2018"
[package.metadata.docs.rs]

2
ruma/Cargo.toml
View File

@ -22,7 +22,7 @@ federation-api = ["ruma-api", "ruma-federation-api", "ruma-signatures"]
[dependencies]
ruma-common = { version = "0.1.3", path = "../ruma-common" }
ruma-identifiers = { version = "0.16.2", features = ["serde"] }
ruma-identifiers = { version = "0.16.2", path = "../ruma-identifiers", features = ["serde"] }
ruma-events = { git = "https://github.com/ruma/ruma-events", rev = "c1ee72d", optional = true }
ruma-signatures = { version = "0.6.0-dev.1", path = "../ruma-signatures", optional = true }