diff --git a/Cargo.toml b/Cargo.toml index 1e0b32bd6..0f4a63bae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ members = [ ] [workspace.package] -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" authors = [ "William Brown ", "James Hodgkinson ", diff --git a/Makefile b/Makefile index 7b47dcbf9..b744712fb 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ IMAGE_BASE ?= kanidm IMAGE_VERSION ?= devel -IMAGE_EXT_VERSION ?= 1.1.0-beta.13 +IMAGE_EXT_VERSION ?= 1.1.0-rc.14 CONTAINER_TOOL_ARGS ?= IMAGE_ARCH ?= "linux/amd64,linux/arm64" CONTAINER_BUILD_ARGS ?= diff --git a/project_docs/RELEASE_CHECKLIST.md b/project_docs/RELEASE_CHECKLIST.md index b2fbb28c5..9559c6842 100644 --- a/project_docs/RELEASE_CHECKLIST.md +++ b/project_docs/RELEASE_CHECKLIST.md @@ -14,7 +14,7 @@ cargo install cargo-udeps ### Cargo Tasks -- [ ] cargo udeps +- [ ] RUSTC\_BOOTSTRAP=1 cargo udeps - [ ] cargo outdated -R - [ ] cargo audit - [ ] cargo test @@ -34,15 +34,14 @@ cargo install cargo-udeps - [ ] build wasm components with release profile - [ ] Update `RELEASE_NOTES.md` - [ ] git commit -- [ ] git rebase -i HEAD~X - [ ] git push origin YYYYMMDD-release - [ ] Merge PR ### Git Management - [ ] git checkout master -- [ ] git branch 1.1.0-alpha.x (Note no v to prevent ref conflict) -- [ ] git checkout v1.1.0-alpha.x +- [ ] git pull +- [ ] git checkout -b 1.1.0-alpha.x (Note no v to prevent ref conflict) - [ ] git tag v1.1.0-alpha.x - [ ] Final inspect of the branch @@ -50,6 +49,7 @@ cargo install cargo-udeps - [ ] git push origin 1.1.0-alpha.x - [ ] git push origin 1.1.0-alpha.x --tags +- [ ] github -> Ensure release branch is protected - [ ] github -> create new release based on tag (not branch) - use tag because then tools will get the tag + patches we apply. @@ -75,6 +75,7 @@ cargo install cargo-udeps - [ ] git checkout master - [ ] git pull -- [ ] git branch YYYYMMDD-dev-version -- [ ] update version in ./kanidmd\_web\_ui/Cargo.toml +- [ ] git checkout -b YYYYMMDD-dev-version +- [ ] update version in ./server/web\_ui/Cargo.toml - [ ] update version in ./Cargo.toml +- [ ] update version in ./Makefile diff --git a/server/web_ui/Cargo.toml b/server/web_ui/Cargo.toml index f09481607..07ad481f6 100644 --- a/server/web_ui/Cargo.toml +++ b/server/web_ui/Cargo.toml @@ -3,7 +3,7 @@ name = "kanidmd_web_ui" description = "Kanidm Server Web User Interface" documentation = "https://docs.rs/kanidm/latest/kanidm/" -version = "1.1.0-beta.13" +version = "1.1.0-rc.14" authors = [ "William Brown ", "James Hodgkinson ",