Skip to content

Commit

Permalink
ci(ribir): version release fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
M-Adoo committed Feb 2, 2024
1 parent a18640a commit 3445d8a
Show file tree
Hide file tree
Showing 18 changed files with 37 additions and 44 deletions.
1 change: 1 addition & 0 deletions .github/workflows/alpha-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
level: 'alpha'
ref: ${{ github.ref }}
merge_changelog: false
toolchain: nightly-2023-10-15
secrets:
CRATE_RELEASE_TOKEN: ${{ secrets.CRATE_RELEASE_TOKEN }}
GITHUB_RELEASE_TOKEN: ${{ secrets.RIBIR_RELEASE }}
1 change: 1 addition & 0 deletions .github/workflows/new-dev-cycle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
level: 'beta'
ref: ${{ github.ref }}
merge_changelog: true
toolchain: nightly-2023-10-15
secrets:
CRATE_RELEASE_TOKEN: ${{ secrets.CRATE_RELEASE_TOKEN }}
GITHUB_RELEASE_TOKEN: ${{ secrets.RIBIR_RELEASE }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/patch-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ jobs:
level: ${{ needs.release_level.outputs.level }}
ref: ${{ github.ref }}
merge_changelog: ${{ needs.release_level.outputs.level == 'patch' }}
toolchain: nightly-2023-10-15
secrets:
CRATE_RELEASE_TOKEN: ${{ secrets.CRATE_RELEASE_TOKEN }}
GITHUB_RELEASE_TOKEN: ${{ secrets.RIBIR_RELEASE }}
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ Please only add new entries below the [Unreleased](#unreleased---releasedate) he

## [@Unreleased] - @ReleaseDate



## 0.1.0-alpha.0 - 2024-01-29

🎉🎉🎉 The first version of Ribir.
Expand Down Expand Up @@ -63,6 +65,4 @@ We are very happy to share it with you. We hope you can try it out and give us f
[lyon]: https://github.com/nical/lyon

<!-- next-url -->
[@Unreleased]: https://github.com/RibirX/Ribir/compare/ribir-v0.1.0-alpha.0...HEAD


[@Unreleased]: https://github.com/RibirX/Ribir/compare/ribir-v0.1.0-alpha.0...HEAD
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ homepage = "https://ribir.org"
keywords = ["gui", "ui", "declarative", "compose-ui"]
license = "MIT"
readme = "README.md"
version = "0.1.0-alpha.0"
version = "0.1.0-beta.5"

[workspace.dependencies]
Inflector = "0.11.4"
Expand Down
10 changes: 5 additions & 5 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ lyon_geom.workspace = true
once_cell.workspace = true
paste.workspace = true
pin-project-lite.workspace = true
ribir_algo = {path = "../algo", version = "0.1.0-alpha.0" }
ribir_geom = {path = "../geom", version = "0.1.0-alpha.0" }
ribir_macros = {path = "../macros", version = "0.1.0-alpha.0" }
ribir_painter = {path = "../painter", version = "0.1.0-alpha.0" }
ribir_text = {path = "../text", version = "0.1.0-alpha.0" }
ribir_algo = {path = "../algo", version = "0.1.0-beta.5" }
ribir_geom = {path = "../geom", version = "0.1.0-beta.5" }
ribir_macros = {path = "../macros", version = "0.1.0-beta.5" }
ribir_painter = {path = "../painter", version = "0.1.0-beta.5" }
ribir_text = {path = "../text", version = "0.1.0-beta.5" }
rxrust.workspace = true
smallvec.workspace = true
winit.workspace = true
Expand Down
8 changes: 4 additions & 4 deletions dev-helper/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ version.workspace = true
[dependencies]
dssim-core.workspace = true
futures.workspace = true
ribir_geom = {path = "../geom", version = "0.1.0-alpha.0" }
ribir_gpu = {path = "../gpu", version = "0.1.0-alpha.0" }
ribir_painter = {path = "../painter", features = ["png"], version = "0.1.0-alpha.0" }
ribir_geom = {path = "../geom", version = "0.1.0-beta.5" }
ribir_gpu = {path = "../gpu", version = "0.1.0-beta.5" }
ribir_painter = {path = "../painter", features = ["png"], version = "0.1.0-beta.5" }

[dev-dependencies]
colored.workspace = true
paste.workspace = true
ribir_core = {path = "../core", version = "0.1.0-alpha.0" }
ribir_core = {path = "../core", version = "0.1.0-beta.5" }
2 changes: 1 addition & 1 deletion docs/en/get_started/try_it.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Next, edit the `Cargo.toml` file and add Ribir as a dependency:

```toml
[dependencies]
ribir = "0.1.0-alpha.0"
ribir = "@RIBIR_VERSION"
```

Or you can directly run `cargo add --git "https://github.com/RibirX/Ribir" ribir` to let Cargo add the latest Ribir version that is under development for you.
Expand Down
2 changes: 1 addition & 1 deletion docs/zh/get_started/try_it.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cd ribir-hello-world

```toml
[dependencies]
ribir = "0.1.0-alpha.0"
ribir = "@RIBIR_VERSION"
```

或者直接运行 `cargo add --git "https://github.com/RibirX/Ribir" ribir` 让 Cargo 为你添加正在开发中的最新 Ribir 版本.
Expand Down
6 changes: 3 additions & 3 deletions gpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ futures = {workspace = true, optional = true}
guillotiere.workspace = true
log.workspace = true
rayon.workspace = true
ribir_algo = {path = "../algo", version = "0.1.0-alpha.0" }
ribir_geom = {path = "../geom", version = "0.1.0-alpha.0" }
ribir_painter = {path = "../painter", features = ["tessellation"], version = "0.1.0-alpha.0" }
ribir_algo = {path = "../algo", version = "0.1.0-beta.5" }
ribir_geom = {path = "../geom", version = "0.1.0-beta.5" }
ribir_painter = {path = "../painter", features = ["tessellation"], version = "0.1.0-beta.5" }
slab = "0.4.8"
wgpu = {workspace = true, optional = true}
zerocopy = {workspace=true, features = ["derive"]}
Expand Down
6 changes: 3 additions & 3 deletions macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ bitflags.workspace = true
lazy_static.workspace = true
proc-macro2.workspace = true
quote.workspace = true
ribir_builtin = {path = "./builtin", version = "0.1.0-alpha.0" }
ribir_painter = {path = "../painter", version = "0.1.0-alpha.0" }
ribir_builtin = {path = "./builtin", version = "0.1.0-beta.5" }
ribir_painter = {path = "../painter", version = "0.1.0-beta.5" }
smallvec.workspace = true
syn = {workspace = true, features = ["fold", "full", "extra-traits"]}

[build-dependencies]
ribir_builtin = {path = "./builtin", version = "0.1.0-alpha.0" }
ribir_builtin = {path = "./builtin", version = "0.1.0-beta.5" }
4 changes: 2 additions & 2 deletions painter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ lyon_algorithms = {version = "1.0.3", features = ["serialization"]}
lyon_tessellation = {version = "1.0.3", features = ["serialization"], optional = true}
material-color-utilities-rs = {workspace = true}
rctree.workspace = true
ribir_algo = {path = "../algo", version = "0.1.0-alpha.0" }
ribir_geom = {path = "../geom", version = "0.1.0-alpha.0" }
ribir_algo = {path = "../algo", version = "0.1.0-beta.5" }
ribir_geom = {path = "../geom", version = "0.1.0-beta.5" }
serde = {version = "1.0", features = ["rc", "derive"]}
serde_json.workspace = true
tiny-skia-path = {workspace = true}
Expand Down
2 changes: 0 additions & 2 deletions painter/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![feature(const_fn_floating_point_arithmetic, test)]

//! A 2d logic painter, generate the paint command
pub mod color;
mod painter;
Expand Down
11 changes: 4 additions & 7 deletions ribir/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ version.workspace = true
[dependencies]
arboard = "3.2.0"
once_cell.workspace = true
ribir_core = { path = "../core", version = "0.1.0-alpha.0" }
ribir_gpu = { path = "../gpu", version = "0.1.0-alpha.0" }
ribir_material = { path = "../themes/material", version = "0.1.0-alpha.0", optional = true }
ribir_widgets = { path = "../widgets", version = "0.1.0-alpha.0", optional = true }
ribir_core = { path = "../core", version = "0.1.0-beta.5" }
ribir_gpu = { path = "../gpu", version = "0.1.0-beta.5" }
ribir_material = { path = "../themes/material", version = "0.1.0-beta.5", optional = true }
ribir_widgets = { path = "../widgets", version = "0.1.0-beta.5", optional = true }
rxrust.workspace = true
wgpu = { workspace = true, optional = true }
winit.workspace = true
Expand Down Expand Up @@ -64,7 +64,4 @@ pre-release-replacements = [
{file="../CHANGELOG.md", search="@ReleaseDate", replace="{{date}}", prerelease = true},
{file="../CHANGELOG.md", search="<!-- next-header -->", replace="<!-- next-header -->\n\n## [@Unreleased] - @ReleaseDate", exactly=1, prerelease = true},
{file="../CHANGELOG.md", search="<!-- next-url -->", replace="<!-- next-url -->\n[@Unreleased]: https://github.com/RibirX/Ribir/compare/{{tag_name}}...HEAD", exactly=1, prerelease = true},
{file="../docs/zh/get_started/try_it.md", search="@RIBIR_VERSION", replace="{{version}}", prerelease = true},
{file="../docs/en/get_started/try_it.md", search="@RIBIR_VERSION", replace="{{version}}", prerelease = true},
]
pre-release-hook = ["./rclog_hook.sh"]
5 changes: 0 additions & 5 deletions ribir/rclog_hook.sh

This file was deleted.

6 changes: 3 additions & 3 deletions text/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ fontdb.workspace = true
log.workspace = true
lyon_path.workspace = true
ordered-float.workspace = true
ribir_algo = {path = "../algo", version = "0.1.0-alpha.0" }
ribir_geom = {path = "../geom", version = "0.1.0-alpha.0" }
ribir_painter = {path = "../painter", version = "0.1.0-alpha.0" }
ribir_algo = {path = "../algo", version = "0.1.0-beta.5" }
ribir_geom = {path = "../geom", version = "0.1.0-beta.5" }
ribir_painter = {path = "../painter", version = "0.1.0-beta.5" }
rustybuzz.workspace = true
unicode-bidi.workspace = true
unicode-script.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions themes/material/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ repository = "https://github.com/RibirX/Ribir/themes/material"
version.workspace = true

[dependencies]
ribir_core = {path = "../../core", version = "0.1.0-alpha.0" }
ribir_widgets = {path = "../../widgets", version = "0.1.0-alpha.0" }
ribir_core = {path = "../../core", version = "0.1.0-beta.5" }
ribir_widgets = {path = "../../widgets", version = "0.1.0-beta.5" }
4 changes: 2 additions & 2 deletions widgets/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ version.workspace = true
[dependencies]
lyon_algorithms.workspace = true
lyon_path.workspace = true
ribir_core = {path = "../core", version = "0.1.0-alpha.0" }
ribir_geom = {path = "../geom", version = "0.1.0-alpha.0" }
ribir_core = {path = "../core", version = "0.1.0-beta.5" }
ribir_geom = {path = "../geom", version = "0.1.0-beta.5" }
webbrowser.workspace = true

[dev-dependencies]
Expand Down

0 comments on commit 3445d8a

Please sign in to comment.