From 39c7247a4cf29b72a51e1ceaa36746d3ab47db68 Mon Sep 17 00:00:00 2001 From: dblock Date: Fri, 3 Sep 2021 16:21:59 +0000 Subject: [PATCH 1/5] Fix publish workflow. --- .github/workflows/rust.yml | 33 +++++++++++++------------------ README.md | 5 +++-- examples/builder/Cargo.toml | 2 +- examples/client_pool/Cargo.toml | 2 +- examples/collect_links/Cargo.toml | 2 +- examples/simple/Cargo.toml | 2 +- 6 files changed, 21 insertions(+), 25 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 281ed80df..f265971e6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -40,25 +40,20 @@ jobs: name: Publish Check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - - name: cargo fetch - uses: actions-rs/cargo@v1 - with: - command: fetch - - name: cargo publish check lychee-lib - uses: actions-rs/cargo@v1 - with: - command: publish - args: --dry-run --manifest-path lychee-lib/Cargo.toml - - name: cargo publish check lychee - uses: actions-rs/cargo@v1 - with: - command: publish - args: --dry-run --manifest-path lychee-bin/Cargo.toml + - uses: actions/checkout@v1 + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true + - name: cargo fetch + uses: actions-rs/cargo@v1 + with: + command: fetch + - uses: actions-rs/install@v0.1 + with: + crate: cargo-publish-all + version: latest + - run: cargo-publish-all --dry-run publish: if: startsWith(github.ref, 'refs/tags/') diff --git a/README.md b/README.md index ced920661..3b50a8cde 100644 --- a/README.md +++ b/README.md @@ -294,12 +294,13 @@ Try one of these links to get started: - [good first issues](https://github.com/lycheeverse/lychee/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) - [help wanted](https://github.com/lycheeverse/lychee/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) -Lychee is written in Rust. Install [rust-up](https://rustup.rs/) to get started. -Begin my making sure the following commands succeed without errors. +Lychee is written in Rust. Install [rust-up](https://rustup.rs/) to get started. Begin my making sure the following commands succeed without errors. ```bash cargo test # runs tests cargo clippy # lints code +cargo install cargo-publish-all +cargo-publish-all --dry-run --yes # dry run release ``` ## Troubleshooting and workarounds diff --git a/examples/builder/Cargo.toml b/examples/builder/Cargo.toml index 92b6bf16d..3763f8692 100644 --- a/examples/builder/Cargo.toml +++ b/examples/builder/Cargo.toml @@ -8,7 +8,7 @@ name = "builder" path = "builder.rs" [dependencies] -lychee-lib = { path = "../../lychee-lib" } +lychee-lib = { path = "../../lychee-lib", version = "0.7.1" } tokio = { version = "1.6.0", features = ["full"] } regex = "1.4.6" http = "0.2.4" diff --git a/examples/client_pool/Cargo.toml b/examples/client_pool/Cargo.toml index 88c91f58b..3e6c4e332 100644 --- a/examples/client_pool/Cargo.toml +++ b/examples/client_pool/Cargo.toml @@ -8,5 +8,5 @@ name = "client_pool" path = "client_pool.rs" [dependencies] -lychee-lib = { path = "../../lychee-lib" } +lychee-lib = { path = "../../lychee-lib", version = "0.7.1" } tokio = { version = "1.6.0", features = ["full"] } diff --git a/examples/collect_links/Cargo.toml b/examples/collect_links/Cargo.toml index 53a85e6bf..5401aa194 100644 --- a/examples/collect_links/Cargo.toml +++ b/examples/collect_links/Cargo.toml @@ -8,7 +8,7 @@ name = "collect_links" path = "collect_links.rs" [dependencies] -lychee-lib = { path = "../../lychee-lib" } +lychee-lib = { path = "../../lychee-lib", version = "0.7.1" } tokio = { version = "1.6.0", features = ["full"] } regex = "1.4.6" http = "0.2.4" diff --git a/examples/simple/Cargo.toml b/examples/simple/Cargo.toml index 447cd223f..90012c538 100644 --- a/examples/simple/Cargo.toml +++ b/examples/simple/Cargo.toml @@ -8,5 +8,5 @@ name = "simple" path = "simple.rs" [dependencies] -lychee-lib = { path = "../../lychee-lib" } +lychee-lib = { path = "../../lychee-lib", version = "0.7.1" } tokio = { version = "1.6.0", features = ["full"] } \ No newline at end of file From 122f15a09ddefa18354878a1c2fc11292e91bde0 Mon Sep 17 00:00:00 2001 From: dblock Date: Fri, 3 Sep 2021 22:39:07 +0000 Subject: [PATCH 2/5] Upgrade type-builder, fixes #305. --- lychee-lib/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lychee-lib/Cargo.toml b/lychee-lib/Cargo.toml index bfd5f478c..eb0a30615 100644 --- a/lychee-lib/Cargo.toml +++ b/lychee-lib/Cargo.toml @@ -38,7 +38,7 @@ ring = "0.16.20" serde = { version = "1.0.125", features = ["derive"] } shellexpand = "2.1.0" tokio = { version = "1.6.0", features = ["full"] } -typed-builder = "0.9.0" +typed-builder = "0.9.1" url = { version = "2.2.2", features = ["serde"] } [dev-dependencies] From ec90aba62f407b2354e03bcab20c5806fabdd553 Mon Sep 17 00:00:00 2001 From: dblock Date: Fri, 3 Sep 2021 22:43:04 +0000 Subject: [PATCH 3/5] Increment version for next developer iteration. --- examples/builder/Cargo.toml | 2 +- examples/client_pool/Cargo.toml | 2 +- examples/collect_links/Cargo.toml | 2 +- examples/simple/Cargo.toml | 2 +- lychee-bin/Cargo.toml | 4 ++-- lychee-lib/Cargo.toml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/builder/Cargo.toml b/examples/builder/Cargo.toml index 3763f8692..77f1084f0 100644 --- a/examples/builder/Cargo.toml +++ b/examples/builder/Cargo.toml @@ -8,7 +8,7 @@ name = "builder" path = "builder.rs" [dependencies] -lychee-lib = { path = "../../lychee-lib", version = "0.7.1" } +lychee-lib = { path = "../../lychee-lib", version = "0.7.2" } tokio = { version = "1.6.0", features = ["full"] } regex = "1.4.6" http = "0.2.4" diff --git a/examples/client_pool/Cargo.toml b/examples/client_pool/Cargo.toml index 3e6c4e332..c8969751c 100644 --- a/examples/client_pool/Cargo.toml +++ b/examples/client_pool/Cargo.toml @@ -8,5 +8,5 @@ name = "client_pool" path = "client_pool.rs" [dependencies] -lychee-lib = { path = "../../lychee-lib", version = "0.7.1" } +lychee-lib = { path = "../../lychee-lib", version = "0.7.2" } tokio = { version = "1.6.0", features = ["full"] } diff --git a/examples/collect_links/Cargo.toml b/examples/collect_links/Cargo.toml index 5401aa194..21d999ac4 100644 --- a/examples/collect_links/Cargo.toml +++ b/examples/collect_links/Cargo.toml @@ -8,7 +8,7 @@ name = "collect_links" path = "collect_links.rs" [dependencies] -lychee-lib = { path = "../../lychee-lib", version = "0.7.1" } +lychee-lib = { path = "../../lychee-lib", version = "0.7.2" } tokio = { version = "1.6.0", features = ["full"] } regex = "1.4.6" http = "0.2.4" diff --git a/examples/simple/Cargo.toml b/examples/simple/Cargo.toml index 90012c538..645e141d1 100644 --- a/examples/simple/Cargo.toml +++ b/examples/simple/Cargo.toml @@ -8,5 +8,5 @@ name = "simple" path = "simple.rs" [dependencies] -lychee-lib = { path = "../../lychee-lib", version = "0.7.1" } +lychee-lib = { path = "../../lychee-lib", version = "0.7.2" } tokio = { version = "1.6.0", features = ["full"] } \ No newline at end of file diff --git a/lychee-bin/Cargo.toml b/lychee-bin/Cargo.toml index 244a3b81f..adeeec2d0 100644 --- a/lychee-bin/Cargo.toml +++ b/lychee-bin/Cargo.toml @@ -14,10 +14,10 @@ keywords = [ ] license = "Apache-2.0/MIT" repository = "https://github.com/lycheeverse/lychee" -version = "0.7.1" +version = "0.7.2" [dependencies] -lychee-lib = { path = "../lychee-lib", version = "0.7.1" } +lychee-lib = { path = "../lychee-lib", version = "0.7.2" } anyhow = "1.0.40" console = "0.14.1" headers = "0.3.4" diff --git a/lychee-lib/Cargo.toml b/lychee-lib/Cargo.toml index eb0a30615..3f02fa987 100644 --- a/lychee-lib/Cargo.toml +++ b/lychee-lib/Cargo.toml @@ -14,7 +14,7 @@ keywords = [ ] license = "Apache-2.0/MIT" repository = "https://github.com/lycheeverse/lychee" -version = "0.7.1" +version = "0.7.2" [dependencies] check-if-email-exists = "0.8.21" From c870c892f4b601cfa29a9339bab62abde37198e1 Mon Sep 17 00:00:00 2001 From: dblock Date: Fri, 3 Sep 2021 22:45:53 +0000 Subject: [PATCH 4/5] Lowercase Publish Check to match lint and test. --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index f265971e6..db9441db3 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -37,7 +37,7 @@ jobs: args: --all-targets -- --deny warnings publish-check: - name: Publish Check + name: publish check runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 From 59b1d06e28822a595389399a734a83e4ddbd3bca Mon Sep 17 00:00:00 2001 From: dblock Date: Fri, 3 Sep 2021 22:52:33 +0000 Subject: [PATCH 5/5] Increment version in lock and README. --- Cargo.lock | 8 ++++---- README.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9d3c2b777..e1d20762a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1349,7 +1349,7 @@ dependencies = [ [[package]] name = "lychee" -version = "0.7.1" +version = "0.7.2" dependencies = [ "anyhow", "assert_cmd", @@ -1378,7 +1378,7 @@ dependencies = [ [[package]] name = "lychee-lib" -version = "0.7.1" +version = "0.7.2" dependencies = [ "check-if-email-exists", "deadpool", @@ -2696,9 +2696,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "typed-builder" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345426c7406aa355b60c5007c79a2d1f5b605540072795222f17f6443e6a9c6f" +checksum = "a46ee5bd706ff79131be9c94e7edcb82b703c487766a114434e5790361cf08c5" dependencies = [ "proc-macro2", "quote", diff --git a/README.md b/README.md index 3b50a8cde..3931258c3 100644 --- a/README.md +++ b/README.md @@ -211,7 +211,7 @@ OPTIONS: -T, --threads Number of threads to utilize. Defaults to number of cores available to the system -t, --timeout Website timeout from connect to response finished [default: 20] - -u, --user-agent User agent [default: lychee/0.7.1] + -u, --user-agent User agent [default: lychee/0.7.2] ARGS: ... The inputs (where to get links to check from). These can be: files (e.g. `README.md`), file globs