Publish job using matrix

Change publish job with matrix, don't fail if another job fail.
cargo: depend on the published version of lldap_auth
2023-05-12 20:41:35 +07:00 · 2023-05-12 15:37:39 +02:00 · 2023-05-12 15:25:59 +02:00 · 2023-05-12 15:25:59 +02:00
8 changed files with 142 additions and 62 deletions
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@ -112,3 +112,28 @@ jobs:
          files: lcov.info
          fail_ci_if_error: true
          token: ${{ secrets.CODECOV_TOKEN }}
+
+  publish-crates:
+    name: Publish on crates.io
+    if: ${{ needs.pre_job.outputs.should_skip != 'true' || (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
+    needs: pre_job
+    strategy:
+      fail-fast: false
+      matrix:
+        target: [lldap_auth, lldap, lldap_app, lldap_set_password, lldap_migration_tool]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3.5.2
+      - uses: actions-rs/toolchain@v1
+        with:
+            toolchain: stable
+            override: true
+      - name: Publish ${{ matrix.target }} crate
+        uses: katyo/publish-crates@v2
+        with:
+            args: -p ${{ matrix.target }}
+            dry-run: ${{ github.event_name != 'release' }}
+            check-repo: ${{ github.event_name != 'pull_request' }}
+            registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+            ignore-unpublished-changes: ${{ github.event_name != 'release' }}
+            
--- a/Cargo.lock
+++ b/Cargo.lock
@ -189,7 +189,7 @@ dependencies = [
 "pin-project-lite",
 "tokio-rustls",
 "tokio-util",
- "webpki-roots",
+ "webpki-roots 0.22.6",
 ]

 [[package]]
@ -2351,7 +2351,7 @@ dependencies = [
 "socket2",
 "tokio",
 "tokio-rustls",
- "webpki-roots",
+ "webpki-roots 0.22.6",
 ]

 [[package]]
@ -2435,7 +2435,7 @@ dependencies = [
 "ldap3",
 "ldap3_proto",
 "lettre",
- "lldap_auth",
+ "lldap_auth 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "log",
 "mockall",
 "nix",
@ -2466,8 +2466,8 @@ dependencies = [
 "tracing-log",
 "tracing-subscriber",
 "urlencoding",
- "uuid 0.8.2",
- "webpki-roots",
+ "uuid 1.3.1",
+ "webpki-roots 0.23.0",
 ]

 [[package]]
@ -2485,13 +2485,13 @@ dependencies = [
 "image",
 "indexmap",
 "jwt 0.13.0",
- "lldap_auth",
+ "lldap_auth 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.8.5",
 "serde",
 "serde_json",
 "url-escape",
 "validator",
- "validator_derive",
+ "validator_derive 0.16.0",
 "wasm-bindgen",
 "wasm-bindgen-futures",
 "web-sys",
@ -2518,6 +2518,25 @@ dependencies = [
 "thiserror",
 ]

+[[package]]
+name = "lldap_auth"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17867a28e09989643401bb7849a494b328416634a335ddf7d3dabc9806ba563"
+dependencies = [
+ "chrono",
+ "curve25519-dalek",
+ "digest 0.9.0",
+ "generic-array",
+ "getrandom 0.2.8",
+ "opaque-ke",
+ "rand 0.8.5",
+ "rust-argon2",
+ "serde",
+ "sha2 0.9.9",
+ "thiserror",
+]
+
 [[package]]
 name = "lldap_migration_tool"
 version = "0.4.2"
@ -2526,7 +2545,7 @@ dependencies = [
 "base64 0.13.1",
 "graphql_client 0.11.0",
 "ldap3",
- "lldap_auth",
+ "lldap_auth 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.8.5",
 "requestty",
 "reqwest",
@ -2541,7 +2560,7 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "clap",
- "lldap_auth",
+ "lldap_auth 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.8.5",
 "reqwest",
 "serde",
@ -2609,12 +2628,6 @@ dependencies = [
 "digest 0.10.6",
 ]

-[[package]]
-name = "md5"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
-
 [[package]]
 name = "memchr"
 version = "2.5.0"
@ -3391,7 +3404,7 @@ dependencies = [
 "wasm-bindgen",
 "wasm-bindgen-futures",
 "web-sys",
- "webpki-roots",
+ "webpki-roots 0.22.6",
 "winreg",
 ]

@ -3519,6 +3532,16 @@ dependencies = [
 "base64 0.21.0",
 ]

+[[package]]
+name = "rustls-webpki"
+version = "0.100.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.11"
@ -4010,7 +4033,7 @@ dependencies = [
 "tokio-stream",
 "url",
 "uuid 1.3.1",
- "webpki-roots",
+ "webpki-roots 0.22.6",
 "whoami",
 ]

@ -4530,10 +4553,6 @@ name = "uuid"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
-dependencies = [
- "getrandom 0.2.8",
- "md5",
-]

 [[package]]
 name = "uuid"
@ -4542,6 +4561,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb"
 dependencies = [
 "getrandom 0.2.8",
+ "md-5",
 ]

 [[package]]
@ -4557,7 +4577,7 @@ dependencies = [
 "serde_derive",
 "serde_json",
 "url",
- "validator_types",
+ "validator_types 0.14.0",
 ]

 [[package]]
@ -4573,7 +4593,23 @@ dependencies = [
 "quote",
 "regex",
 "syn 1.0.109",
- "validator_types",
+ "validator_types 0.14.0",
+]
+
+[[package]]
+name = "validator_derive"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af"
+dependencies = [
+ "if_chain",
+ "lazy_static",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn 1.0.109",
+ "validator_types 0.16.0",
 ]

 [[package]]
@ -4586,6 +4622,16 @@ dependencies = [
 "syn 1.0.109",
 ]

+[[package]]
+name = "validator_types"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3"
+dependencies = [
+ "proc-macro2",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "valuable"
 version = "0.1.0"
@ -4742,6 +4788,15 @@ dependencies = [
 "webpki",
 ]

+[[package]]
+name = "webpki-roots"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa54963694b65584e170cf5dc46aeb4dcaa5584e652ff5f3952e56d66aff0125"
+dependencies = [
+ "rustls-webpki",
+]
+
 [[package]]
 name = "whoami"
 version = "1.3.0"
@ -4968,7 +5023,7 @@ source = "git+https://github.com/jfbilodeau/yew_form?rev=4b9fabffb63393ec7626a44
 dependencies = [
 "gloo-console",
 "validator",
- "validator_derive",
+ "validator_derive 0.14.0",
 "wasm-bindgen",
 "web-sys",
 "yew",
--- a/app/Cargo.toml
+++ b/app/Cargo.toml
@ -14,7 +14,7 @@ anyhow = "1"
 base64 = "0.13"
 gloo-console = "0.2.3"
 gloo-file = "0.2.3"
-gloo-net = "*"
+gloo-net = "0.2"
 graphql_client = "0.10"
 http = "0.2"
 jwt = "0.13"
@ -23,9 +23,9 @@ serde = "1"
 serde_json = "1"
 url-escape = "0.1.1"
 validator = "=0.14"
-validator_derive = "*"
+validator_derive = "0.16"
 wasm-bindgen = "0.2"
-wasm-bindgen-futures = "*"
+wasm-bindgen-futures = "0.4"
 yew = "0.19.3"
 yew-router = "0.16"

@ -47,13 +47,13 @@ features = [
 ]

 [dependencies.chrono]
-version = "*"
+version = "0.4"
 features = [
  "wasmbind"
 ]

 [dependencies.lldap_auth]
-path = "../auth"
+version = "0.3"
 features = [ "opaque_client" ]

 [dependencies.image]
--- a/auth/Cargo.toml
+++ b/auth/Cargo.toml
@ -18,17 +18,17 @@ js = []
 rust-argon2 = "0.8"
 curve25519-dalek = "3"
 digest = "0.9"
-generic-array = "*"
+generic-array = "0.14"
 rand = "0.8"
-serde = "*"
+serde = "1"
 sha2 = "0.9"
-thiserror = "*"
+thiserror = "1"

 [dependencies.opaque-ke]
 version = "0.6"

 [dependencies.chrono]
-version = "*"
+version = "0.4"
 features = [ "serde" ]

 # For WASM targets, use the JS getrandom.
--- a/migration-tool/Cargo.toml
+++ b/migration-tool/Cargo.toml
@ -9,16 +9,16 @@ repository = "https://github.com/lldap/lldap"
 version = "0.4.2"

 [dependencies]
-anyhow = "*"
+anyhow = "1"
 base64 = "0.13"
 rand = "0.8"
 requestty = "0.4.1"
 serde = "1"
 serde_json = "1"
-smallvec = "*"
+smallvec = "1"

 [dependencies.lldap_auth]
-path = "../auth"
+version = "0.3"
 features = ["opaque_client"]

 [dependencies.graphql_client]
@ -27,11 +27,11 @@ default-features = false
 version = "0.11"

 [dependencies.reqwest]
-version = "*"
+version = "0.11"
 default-features = false
 features = ["json", "blocking", "rustls-tls"]

 [dependencies.ldap3]
-version = "*"
+version = "0.11"
 default-features = false
 features = ["sync", "tls-rustls"]
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@ -19,45 +19,45 @@ actix-server = "2"
 actix-service = "2"
 actix-web = "4.3"
 actix-web-httpauth = "0.8"
-anyhow = "*"
+anyhow = "1"
 async-trait = "0.1"
 base64 = "0.21"
 bincode = "1.3"
-cron = "*"
+cron = "0.12"
 derive_builder = "0.12"
 figment_file_provider_adapter = "0.1"
-futures = "*"
-futures-util = "*"
+futures = "0.3"
+futures-util = "0.3"
 hmac = "0.12"
-http = "*"
+http = "0.2"
 itertools = "0.10"
 juniper = "0.15"
 jwt = "0.16"
 lber = "0.4.1"
 ldap3_proto = ">=0.3.1"
-log = "*"
+log = "0.4"
 orion = "0.17"
 rand_chacha = "0.3"
 rustls-pemfile = "1"
-serde = "*"
+serde = "1"
 serde_bytes = "0.11"
 serde_json = "1"
 sha2 = "0.10"
-thiserror = "*"
+thiserror = "1"
 time = "0.3"
 tokio-rustls = "0.23"
-tokio-stream = "*"
+tokio-stream = "0.1"
 tokio-util = "0.7"
-tracing = "*"
+tracing = "0.1"
 tracing-actix-web = "0.7"
 tracing-attributes = "^0.1.21"
-tracing-log = "*"
+tracing-log = "0.1"
 urlencoding = "2"
-webpki-roots = "*"
+webpki-roots = "0.23"

 [dependencies.chrono]
 features = ["serde"]
-version = "*"
+version = "0.4"

 [dependencies.clap]
 features = ["std", "color", "suggestions", "derive", "env"]
@ -65,7 +65,7 @@ version = "4"

 [dependencies.figment]
 features = ["env", "toml"]
-version = "*"
+version = "0.10"

 [dependencies.tracing-subscriber]
 version = "0.3"
@ -77,7 +77,7 @@ default-features = false
 version = "0.10.1"

 [dependencies.lldap_auth]
-path = "../auth"
+version = "0.3"

 [dependencies.opaque-ke]
 version = "0.6"
@ -88,7 +88,7 @@ version = "0.8"

 [dependencies.secstr]
 features = ["serde"]
-version = "*"
+version = "0.5"

 [dependencies.tokio]
 features = ["full"]
@ -96,7 +96,7 @@ version = "1.25"

 [dependencies.uuid]
 features = ["v3"]
-version = "*"
+version = "1"

 [dependencies.tracing-forest]
 features = ["smallvec", "chrono", "tokio"]
@ -136,12 +136,12 @@ default-features = false
 version = "0.11"

 [dev-dependencies.ldap3]
-version = "*"
+version = "0.11"
 default-features = false
 features = ["sync", "tls-rustls"]

 [dev-dependencies.reqwest]
-version = "*"
+version = "0.11"
 default-features = false
 features = ["json", "blocking", "rustls-tls"]

@ -151,5 +151,5 @@ default-features = false
 features = ["file_locks"]

 [dev-dependencies.uuid]
-version = "*"
+version = "1"
 features = ["v4"]
--- a/server/tests/common/fixture.rs
+++ b/server/tests/common/fixture.rs
@ -222,7 +222,7 @@ impl Drop for LLDAPFixture {

 pub fn new_id(prefix: Option<&str>) -> String {
    let id = Uuid::new_v4();
-    let id = format!("{}-lldap-test", id.to_simple());
+    let id = format!("{}-lldap-test", id.simple());
    match prefix {
        Some(prefix) => format!("{}{}", prefix, id),
        None => id,
--- a/set-password/Cargo.toml
+++ b/set-password/Cargo.toml
@ -11,7 +11,7 @@ version = "0.1.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-anyhow = "*"
+anyhow = "1"
 rand = "0.8"
 serde = "1"
 serde_json = "1"
@ -21,10 +21,10 @@ features = ["std", "color", "suggestions", "derive", "env"]
 version = "4"

 [dependencies.lldap_auth]
-path = "../auth"
+version = "0.3"
 features = ["opaque_client"]

 [dependencies.reqwest]
-version = "*"
+version = "0.11"
 default-features = false
 features = ["json", "blocking", "rustls-tls"]
Author	SHA1	Message	Date
Dedy Martadinata S	1b2dfbe52e	Publish job using matrix Change publish job with matrix, don't fail if another job fail.	2023-05-12 20:41:35 +07:00
Valentin Tolmer	e1aa2bfb18	cargo: depend on the published version of lldap_auth	2023-05-12 15:37:39 +02:00
Valentin Tolmer	1377d5aed9	github: create actions to publish crates	2023-05-12 15:25:59 +02:00
Valentin Tolmer	fa0185af5e	cargo: set specific versions for each dependency	2023-05-12 15:25:59 +02:00