diff --git a/CHANGELOG.md b/CHANGELOG.md index 16ad472d5..796003530 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [0.18.1](https://github.com/pactus-project/pactus/compare/v0.18.0...v0.18.1) (2023-12-13) + +### Fix + +- fixing logger issue on rotating log file ([#859](https://github.com/pactus-project/pactus/pull/859)) + ## [0.18.0](https://github.com/pactus-project/pactus/compare/v0.17.0...v0.18.0) (2023-12-11) ### Feat diff --git a/docs/patching.md b/docs/patching.md index 08f376206..3a4769dbb 100644 --- a/docs/patching.md +++ b/docs/patching.md @@ -2,30 +2,14 @@ To patch a released version, start by creating a dedicated branch for that version, proceed with the required updates, and eventually release the patched branch. -1. **Creating Environment Variables** - -Let's create environment variables for the patch version. For the rest of this document, we will use these environment variables in the commands. - -```bash -PRV_VER="0.17.0" -CUR_VER="0.17.0" -NEXT_VER="0.17.1" -TAG_NAME="v${CUR_VER}" -TAG_MSG="Version ${CUR_VER}" -BASE_BRANCH="0.17.x" -BASE_VER="0.17.0" -``` - -For the rest of this document, we will use these environment variables in commands. -Keep your terminal open. - -2. **Creating a new branch** +1. **Patch branch** If this is the first patch for the specific major version, we need to first create a branch for this tag: ```bash -git checkout -b ${BASE_BRANCH} v${BASE_VER} -git branch --set-upstream-to=origin/${BASE_BRANCH} +git checkout -b 0..x v0..0 +git log +git push --set-upstream origin 0..x ``` and update the patch version inside the [version.go](../version/version.go) file. @@ -33,17 +17,34 @@ and update the patch version inside the [version.go](../version/version.go) file Otherwise, switch to the patch branch: ```bash -git checkout ${BASE_BRANCH} +git checkout origin/0..x ``` -3. **Updating the branch** +2. **Updating the branch** Apply the fixes to the branch. You can use [cherry-pick](https://www.atlassian.com/git/tutorials/cherry-pick) to pick some commits from the main branch and apply them to the patch branch: ```bash git cherry-pick +git push ``` +3. **Creating Environment Variables** + +Let's create environment variables for the patch version. For the rest of this document, we will use these environment variables in the commands. + +```bash +PRV_VER="0.18.0" +CUR_VER="0.18.1" +NEXT_VER="0.18.2" +TAG_NAME="v${CUR_VER}" +TAG_MSG="Version ${CUR_VER}" +BASE_BRANCH="0.18.x" +``` + +For the rest of this document, we will use these environment variables in commands. +Keep your terminal open. + 4. **Follow the [Releasing](./releasing.md) Document** Please refer to the [Releasing](./releasing.md) document and follow the steps outlined from Step 4 until the end to complete the patching process. diff --git a/version/version.go b/version/version.go index ef8c191e9..5e48fcef5 100644 --- a/version/version.go +++ b/version/version.go @@ -11,7 +11,7 @@ import ( const ( major uint = 0 minor uint = 18 - patch uint = 0 + patch uint = 1 meta string = "" protocolVersion uint = 1 )