From 56fc770bb9e1660123ef21be003fd8ca2371b8eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Sun, 23 Oct 2022 21:38:19 +0200 Subject: [PATCH 1/4] fix/remove old config value --- release.toml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/release.toml b/release.toml index 55e74b774e..f626223b3e 100644 --- a/release.toml +++ b/release.toml @@ -1,8 +1,7 @@ -no-dev-version = true pre-release-commit-message = "release {{crate_name}} {{version}}" -disable-tag = true -disable-push = true -disable-publish = true +tag = false +push = false +publish = false enable-features = ["all", "twitch_oauth2/all", "unsupported"] pre-release-replacements = [ {file="CHANGELOG.md", search="Unreleased", replace="v{{version}}", prerelease=false}, From f221c668d6061c0720bbc8c1d6ff5924006dcdff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Sun, 23 Oct 2022 22:15:36 +0200 Subject: [PATCH 2/4] don't check changelog on pre-releases --- xtask/src/main.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 5972ab584d..fc6543e6e2 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -56,10 +56,12 @@ fn main() -> color_eyre::Result<()> { let change_log = std::fs::read_to_string(get_cargo_workspace().join("CHANGELOG.md"))?; - color_eyre::eyre::ensure!( - change_log.contains(&format!("## [{tag}] -")), - "change log is not updated" - ); + if !tag.contains('-') { + color_eyre::eyre::ensure!( + change_log.contains(&format!("## [{tag}] -")), + "change log is not updated" + ); + } if dry_run { eprintln!("{}", cmd!(sh, "git tag {tag}")); From 782e4c5bf53a507ae595d3d0bdc34bf399096678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Sun, 23 Oct 2022 21:41:43 +0200 Subject: [PATCH 3/4] prepare release --- README.md | 6 +++--- release.toml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ab01826af5..17947f256b 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # Twitch API | Rust library for talking with the new Twitch API aka. "Helix", TMI and more! -[![github]](https://github.com/twitch-rs/twitch_api) [![crates-io]](https://crates.io/crates/twitch_api2) [![docs-rs-big]](https://docs.rs/twitch_api2/0.6.1/twitch_api2/) +[![github]](https://github.com/twitch-rs/twitch_api) [![crates-io]](https://crates.io/crates/twitch_api) [![docs-rs-big]](https://docs.rs/twitch_api/0.6.1/twitch_api/) [github]: https://img.shields.io/badge/github-twitch--rs/twitch__api-8da0cb?style=for-the-badge&labelColor=555555&logo=github -[crates-io]: https://img.shields.io/crates/v/twitch_api2.svg?style=for-the-badge&color=fc8d62&logo=rust +[crates-io]: https://img.shields.io/crates/v/twitch_api.svg?style=for-the-badge&color=fc8d62&logo=rust [docs-rs-big]: https://img.shields.io/badge/docs.rs-twitch__api2-66c2a5?style=for-the-badge&labelColor=555555&logoColor=white&logo=data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDUxMiA1MTIiPjxwYXRoIGZpbGw9IiNmNWY1ZjUiIGQ9Ik00ODguNiAyNTAuMkwzOTIgMjE0VjEwNS41YzAtMTUtOS4zLTI4LjQtMjMuNC0zMy43bC0xMDAtMzcuNWMtOC4xLTMuMS0xNy4xLTMuMS0yNS4zIDBsLTEwMCAzNy41Yy0xNC4xIDUuMy0yMy40IDE4LjctMjMuNCAzMy43VjIxNGwtOTYuNiAzNi4yQzkuMyAyNTUuNSAwIDI2OC45IDAgMjgzLjlWMzk0YzAgMTMuNiA3LjcgMjYuMSAxOS45IDMyLjJsMTAwIDUwYzEwLjEgNS4xIDIyLjEgNS4xIDMyLjIgMGwxMDMuOS01MiAxMDMuOSA1MmMxMC4xIDUuMSAyMi4xIDUuMSAzMi4yIDBsMTAwLTUwYzEyLjItNi4xIDE5LjktMTguNiAxOS45LTMyLjJWMjgzLjljMC0xNS05LjMtMjguNC0yMy40LTMzLjd6TTM1OCAyMTQuOGwtODUgMzEuOXYtNjguMmw4NS0zN3Y3My4zek0xNTQgMTA0LjFsMTAyLTM4LjIgMTAyIDM4LjJ2LjZsLTEwMiA0MS40LTEwMi00MS40di0uNnptODQgMjkxLjFsLTg1IDQyLjV2LTc5LjFsODUtMzguOHY3NS40em0wLTExMmwtMTAyIDQxLjQtMTAyLTQxLjR2LS42bDEwMi0zOC4yIDEwMiAzOC4ydi42em0yNDAgMTEybC04NSA0Mi41di03OS4xbDg1LTM4Ljh2NzUuNHptMC0xMTJsLTEwMiA0MS40LTEwMi00MS40di0uNmwxMDItMzguMiAxMDIgMzguMnYuNnoiPjwvcGF0aD48L3N2Zz4K -See [documentation](https://docs.rs/twitch_api2) for more info. +See [documentation](https://docs.rs/twitch_api) for more info. You can see current unpublished docs here: [![local-docs]](https://twitch-rs.github.io/twitch_api/twitch_api) diff --git a/release.toml b/release.toml index f626223b3e..330f1ffbb1 100644 --- a/release.toml +++ b/release.toml @@ -3,6 +3,7 @@ tag = false push = false publish = false enable-features = ["all", "twitch_oauth2/all", "unsupported"] +consolidate-commits = false pre-release-replacements = [ {file="CHANGELOG.md", search="Unreleased", replace="v{{version}}", prerelease=false}, {file="CHANGELOG.md", search="ReleaseDate", replace="{{date}}", prerelease=false}, From 832f9479941ca3f0eddaa06b374d02f608ace32c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Sun, 23 Oct 2022 21:52:50 +0200 Subject: [PATCH 4/4] release twitch_api 0.7.0-alpha.1 --- Cargo.lock | 2 +- Cargo.toml | 6 +++--- README.md | 2 +- src/lib.rs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6bae31e564..2db402bd57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2731,7 +2731,7 @@ dependencies = [ [[package]] name = "twitch_api" -version = "0.6.1" +version = "0.7.0-alpha.1" dependencies = [ "aliri_braid", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 49f3625cc4..abf0040874 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "twitch_api" -version = "0.6.1" +version = "0.7.0-alpha.1" authors = ["Emil Gardström "] edition = "2018" repository = "https://github.com/twitch-rs/twitch_api" license = "MIT OR Apache-2.0" description = "Library for talking with the new Twitch API aka. \"Helix\", TMI and more!" keywords = ["oauth", "twitch", "async", "asynchronous", "api"] -documentation = "https://docs.rs/twitch_api/0.6.1" +documentation = "https://docs.rs/twitch_api/0.7.0-alpha.1" readme = "README.md" resolver = "2" include = [ @@ -27,7 +27,7 @@ members = ["xtask", "examples/*"] exclude = ["twitch_types", "twitch_oauth2"] [workspace.dependencies] -twitch_api = { version = "0.6.1", path = "." } +twitch_api = { version = "0.7.0-alpha.1", path = "." } twitch_oauth2 = { version = "0.9.0", path = "twitch_oauth2/" } [dependencies] diff --git a/README.md b/README.md index 17947f256b..3ae29fb46d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Twitch API | Rust library for talking with the new Twitch API aka. "Helix", TMI and more! -[![github]](https://github.com/twitch-rs/twitch_api) [![crates-io]](https://crates.io/crates/twitch_api) [![docs-rs-big]](https://docs.rs/twitch_api/0.6.1/twitch_api/) +[![github]](https://github.com/twitch-rs/twitch_api) [![crates-io]](https://crates.io/crates/twitch_api) [![docs-rs-big]](https://docs.rs/twitch_api/0.7.0-alpha.1/twitch_api/) [github]: https://img.shields.io/badge/github-twitch--rs/twitch__api-8da0cb?style=for-the-badge&labelColor=555555&logo=github [crates-io]: https://img.shields.io/crates/v/twitch_api.svg?style=for-the-badge&color=fc8d62&logo=rust diff --git a/src/lib.rs b/src/lib.rs index 900239befe..871b62323a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,8 +1,8 @@ #![deny(missing_docs, rustdoc::broken_intra_doc_links)] #![cfg_attr(nightly, feature(doc_cfg))] #![cfg_attr(nightly, feature(doc_auto_cfg))] -#![doc(html_root_url = "https://docs.rs/twitch_api/0.6.1")] -//! [![github]](https://github.com/twitch-rs/twitch_api) [![crates-io]](https://crates.io/crates/twitch_api) [![docs-rs-big]](https://docs.rs/twitch_api/0.6.1/twitch_api) +#![doc(html_root_url = "https://docs.rs/twitch_api/0.7.0-alpha.1")] +//! [![github]](https://github.com/twitch-rs/twitch_api) [![crates-io]](https://crates.io/crates/twitch_api) [![docs-rs-big]](https://docs.rs/twitch_api/0.7.0-alpha.1/twitch_api) //! //! [github]: https://img.shields.io/badge/github-twitch--rs/twitch__api-8da0cb?style=for-the-badge&labelColor=555555&logo=github" //! [crates-io]: https://img.shields.io/crates/v/twitch_api.svg?style=for-the-badge&color=fc8d62&logo=rust"