From 26baa8d3dc48eb7672c880e225024d9211f1daa3 Mon Sep 17 00:00:00 2001 From: nbrouand <7816908+nbrouand@users.noreply.github.com> Date: Tue, 19 Mar 2024 15:48:05 +0100 Subject: [PATCH] chore: Release 2.7.0.1 --- .github/workflows/release-github-template.yml | 12 ++++++-- .github/workflows/release-to-github.yml | 29 +++++++++++++++++++ .../{release.yml => release-to-ossrh.yml} | 8 ++--- CHANGELOG.md | 26 +++++++++++++---- chutney/action-impl/pom.xml | 2 +- chutney/action-spi/pom.xml | 2 +- chutney/chutney-junit/api/pom.xml | 2 +- chutney/chutney-junit/engine/pom.xml | 2 +- chutney/chutney-junit/pom.xml | 2 +- chutney/engine/pom.xml | 2 +- chutney/environment/pom.xml | 2 +- chutney/glacio-adapter/pom.xml | 2 +- chutney/jira/pom.xml | 2 +- chutney/packaging/local-api-unsecure/pom.xml | 2 +- chutney/packaging/local-dev/pom.xml | 2 +- chutney/packaging/pom.xml | 2 +- chutney/pom.xml | 4 +-- chutney/server-core/pom.xml | 2 +- chutney/server/pom.xml | 2 +- chutney/tools/pom.xml | 2 +- chutney/ui/pom.xml | 2 +- idea-plugin/gradle.properties | 2 +- kotlin-dsl/gradle.properties | 2 +- 23 files changed, 83 insertions(+), 32 deletions(-) create mode 100644 .github/workflows/release-to-github.yml rename .github/workflows/{release.yml => release-to-ossrh.yml} (90%) diff --git a/.github/workflows/release-github-template.yml b/.github/workflows/release-github-template.yml index dd69bb47c..1a203826d 100644 --- a/.github/workflows/release-github-template.yml +++ b/.github/workflows/release-github-template.yml @@ -2,10 +2,16 @@ name: "Release on Github" on: workflow_call: - + inputs: + publish-to-github-maven-registry: + default: true + type: boolean + description: "Skip publish-to-github-maven-registry if false" jobs: create-github-release: runs-on: ubuntu-latest + permissions: + contents: write steps: - name: Create github release id: create_release @@ -23,7 +29,7 @@ jobs: publish-to-github-maven-registry: uses: ./.github/workflows/build-all-template.yml - if: ${{ github.ref_name =~ ^\d+\.\d+\.\d+\.\d+$ }} + if: ${{inputs.publish-to-github-maven-registry}} with: release: true secrets: @@ -33,6 +39,8 @@ jobs: upload-plugin-to-release: + permissions: + contents: write needs: [ create-github-release] runs-on: ubuntu-latest steps: diff --git a/.github/workflows/release-to-github.yml b/.github/workflows/release-to-github.yml new file mode 100644 index 000000000..f445d179f --- /dev/null +++ b/.github/workflows/release-to-github.yml @@ -0,0 +1,29 @@ +name: "Release to github registry" + +on: + push: + tags: + - '[1-9]+.[0-9]+.[0-9]+.[0-9]+' + +jobs: + build: + uses: ./.github/workflows/build-all-template.yml + with: + skipTests: true + cache-artifacts: | + chutney/packaging/local-dev/target/chutney-local-dev-*.jar + idea-plugin/build/distributions/*.zip + chutney/ui/dist + + release-github: + needs: [ build ] + uses: ./.github/workflows/release-github-template.yml + + release-docker: + needs: [ build ] + uses: ./.github/workflows/release-docker-template.yml + with: + version: ${{needs.build.outputs.PROJECT_VERSION}} + secrets: + github-token: ${{ secrets.GITHUB_TOKEN }} + diff --git a/.github/workflows/release.yml b/.github/workflows/release-to-ossrh.yml similarity index 90% rename from .github/workflows/release.yml rename to .github/workflows/release-to-ossrh.yml index 21953bb66..1d892ab85 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release-to-ossrh.yml @@ -1,10 +1,9 @@ -name: "Release all" +name: "Release to OSSRH" on: push: tags: - - '*.*.*' - - '*.*.*.*' + - '[1-9]+.[0-9]+.[0-9]+' jobs: build: @@ -19,9 +18,10 @@ jobs: release-github: needs: [ build ] uses: ./.github/workflows/release-github-template.yml + with: + publish-to-github-maven-registry: false release-to-OSSRH: - if: ${{ github.ref_name =~ ^\d+\.\d+\.\d+$) }} needs: [ build ] uses: ./.github/workflows/build-all-template.yml with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 1399e540b..aee209c0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,30 @@ # Changelog -## What's Changed -## [2.7.1-RC](https://github.com/chutney-testing/chutney/tree/2.7.1-RC) +## [2.7.0.1](https://github.com/chutney-testing/chutney/tree/2.7.0.1) +### 🚀 Implemented enhancements: +* Increase close area on executions tabs by @KarimGl in https://github.com/chutney-testing/chutney/pull/14 +* Right menu -> middle menu by @nbrouand in https://github.com/chutney-testing/chutney/pull/18 ### 🐛 Fixed bugs: -* fix(server): remove write numbers as strings in reports by @KarimGl in https://github.com/chutney-testing/chutney/pull/11 +* Get campaign fetches executions from db by @KarimGl in https://github.com/chutney-testing/chutney/pull/32 +* getLastExecutions returns the last running exec if available, otherwise the last exec by @KarimGl in https://github.com/chutney-testing/chutney/pull/33 +* Remove write numbers as strings in reports by @KarimGl in https://github.com/chutney-testing/chutney/pull/11 ### 🔧 Technical enhancements: -* chore(): Clean transitive dependencies from kotlin-dsl & server packaging jar name by @KarimGl in https://github.com/chutney-testing/chutney/pull/12 +* log login and logout actions by @KarimGl in https://github.com/chutney-testing/chutney/pull/20 +* Clean JIRA service log by @boddissattva in https://github.com/chutney-testing/chutney/pull/19 +* Updating contributing for new release management by @nbrouand in https://github.com/chutney-testing/chutney/pull/31 +* Chutney selenium action test - Use correct web driver output key by @boddissattva in https://github.com/chutney-testing/chutney/pull/35 +* Allow build with TestContainers' test for kotlin-dsl on docker in WSL2 without desktop by @boddissattva in https://github.com/chutney-testing/chutney/pull/37 +* Clean transitive dependencies from kotlin-dsl & server packaging jar name by @KarimGl in https://github.com/chutney-testing/chutney/pull/12 +### 👒 Dependencies: +* chore(deps): Bump org.codehaus.mojo:exec-maven-plugin from 3.1.1 to 3.2.0 in /chutney by @dependabot in https://github.com/chutney-testing/chutney/pull/21 +* chore(deps): Bump org.codehaus.mojo:build-helper-maven-plugin from 3.3.0 to 3.5.0 in /chutney by @dependabot in https://github.com/chutney-testing/chutney/pull/25 +* chore(deps): Bump org.testcontainers:testcontainers-bom from 1.19.3 to 1.19.6 in /chutney by @dependabot in https://github.com/chutney-testing/chutney/pull/29 -**[Full Changelog](https://github.com/chutney-testing/chutney/commits/2.7.1-RC)** +**[Full Changelog](https://github.com/chutney-testing/chutney/compare/Mono-repo...2.7.0.1)** -## Please check release note before 2.7.1 here : + +## Please check release note before 2.7.0.1 here : - [chutney](https://github.com/chutney-testing/chutney-legacy/releases) - [kotlin-dsl](https://github.com/chutney-testing/chutney-kotlin-dsl-legacy/releases) diff --git a/chutney/action-impl/pom.xml b/chutney/action-impl/pom.xml index 2d5a76fcf..4cdadeb2f 100644 --- a/chutney/action-impl/pom.xml +++ b/chutney/action-impl/pom.xml @@ -7,7 +7,7 @@ com.chutneytesting chutney-parent - 2.7.1-SNAPSHOT + 2.7.0.1 action-impl diff --git a/chutney/action-spi/pom.xml b/chutney/action-spi/pom.xml index 37871912a..825e7de20 100644 --- a/chutney/action-spi/pom.xml +++ b/chutney/action-spi/pom.xml @@ -7,7 +7,7 @@ com.chutneytesting chutney-parent - 2.7.1-SNAPSHOT + 2.7.0.1 action-spi diff --git a/chutney/chutney-junit/api/pom.xml b/chutney/chutney-junit/api/pom.xml index ef66d9119..3af53725a 100644 --- a/chutney/chutney-junit/api/pom.xml +++ b/chutney/chutney-junit/api/pom.xml @@ -7,7 +7,7 @@ com.chutneytesting chutney-junit-parent - 2.7.1-SNAPSHOT + 2.7.0.1 chutney-junit-api diff --git a/chutney/chutney-junit/engine/pom.xml b/chutney/chutney-junit/engine/pom.xml index f30920c7c..f7c7382d4 100644 --- a/chutney/chutney-junit/engine/pom.xml +++ b/chutney/chutney-junit/engine/pom.xml @@ -7,7 +7,7 @@ com.chutneytesting chutney-junit-parent - 2.7.1-SNAPSHOT + 2.7.0.1 chutney-junit-engine diff --git a/chutney/chutney-junit/pom.xml b/chutney/chutney-junit/pom.xml index a43c4599c..dae4445c5 100644 --- a/chutney/chutney-junit/pom.xml +++ b/chutney/chutney-junit/pom.xml @@ -7,7 +7,7 @@ com.chutneytesting chutney-parent - 2.7.1-SNAPSHOT + 2.7.0.1 chutney-junit-parent diff --git a/chutney/engine/pom.xml b/chutney/engine/pom.xml index 5cbbb0d63..c72337da3 100644 --- a/chutney/engine/pom.xml +++ b/chutney/engine/pom.xml @@ -7,7 +7,7 @@ com.chutneytesting chutney-parent - 2.7.1-SNAPSHOT + 2.7.0.1 engine diff --git a/chutney/environment/pom.xml b/chutney/environment/pom.xml index 32c780ad0..1c4695a09 100644 --- a/chutney/environment/pom.xml +++ b/chutney/environment/pom.xml @@ -5,7 +5,7 @@ chutney-parent com.chutneytesting - 2.7.1-SNAPSHOT + 2.7.0.1 4.0.0 diff --git a/chutney/glacio-adapter/pom.xml b/chutney/glacio-adapter/pom.xml index ce5a68fa7..e639c1237 100644 --- a/chutney/glacio-adapter/pom.xml +++ b/chutney/glacio-adapter/pom.xml @@ -7,7 +7,7 @@ com.chutneytesting chutney-parent - 2.7.1-SNAPSHOT + 2.7.0.1 glacio-adapter diff --git a/chutney/jira/pom.xml b/chutney/jira/pom.xml index f8f33b9e1..89378f9f5 100644 --- a/chutney/jira/pom.xml +++ b/chutney/jira/pom.xml @@ -5,7 +5,7 @@ chutney-parent com.chutneytesting - 2.7.1-SNAPSHOT + 2.7.0.1 4.0.0 diff --git a/chutney/packaging/local-api-unsecure/pom.xml b/chutney/packaging/local-api-unsecure/pom.xml index 04d248e4f..85d5e1800 100644 --- a/chutney/packaging/local-api-unsecure/pom.xml +++ b/chutney/packaging/local-api-unsecure/pom.xml @@ -7,7 +7,7 @@ com.chutneytesting packaging - 2.7.1-SNAPSHOT + 2.7.0.1 local-api-unsecure diff --git a/chutney/packaging/local-dev/pom.xml b/chutney/packaging/local-dev/pom.xml index 85f8e31ab..81a6b88b5 100644 --- a/chutney/packaging/local-dev/pom.xml +++ b/chutney/packaging/local-dev/pom.xml @@ -7,7 +7,7 @@ com.chutneytesting packaging - 2.7.1-SNAPSHOT + 2.7.0.1 local-dev diff --git a/chutney/packaging/pom.xml b/chutney/packaging/pom.xml index 63ae8f56e..bd10fc341 100644 --- a/chutney/packaging/pom.xml +++ b/chutney/packaging/pom.xml @@ -6,7 +6,7 @@ com.chutneytesting chutney-parent - 2.7.1-SNAPSHOT + 2.7.0.1 packaging pom diff --git a/chutney/pom.xml b/chutney/pom.xml index fcd63f39e..9a84bb8de 100644 --- a/chutney/pom.xml +++ b/chutney/pom.xml @@ -5,7 +5,7 @@ com.chutneytesting chutney-parent - 2.7.1-SNAPSHOT + 2.7.0.1 pom Chutney @@ -48,7 +48,7 @@ https://github.com/chutney-testing/chutney.git scm:git:git@github.com:chutney-testing/chutney.git scm:git:git@github.com:chutney-testing/chutney.git - 2.7.1-RC + 2.7.0.1 diff --git a/chutney/server-core/pom.xml b/chutney/server-core/pom.xml index 382a31a0b..c7f7741c4 100644 --- a/chutney/server-core/pom.xml +++ b/chutney/server-core/pom.xml @@ -7,7 +7,7 @@ chutney-parent com.chutneytesting - 2.7.1-SNAPSHOT + 2.7.0.1 server-core diff --git a/chutney/server/pom.xml b/chutney/server/pom.xml index 80b328430..dbac10e3c 100644 --- a/chutney/server/pom.xml +++ b/chutney/server/pom.xml @@ -7,7 +7,7 @@ com.chutneytesting chutney-parent - 2.7.1-SNAPSHOT + 2.7.0.1 server diff --git a/chutney/tools/pom.xml b/chutney/tools/pom.xml index 094da4bcd..6d9e53690 100644 --- a/chutney/tools/pom.xml +++ b/chutney/tools/pom.xml @@ -7,7 +7,7 @@ com.chutneytesting chutney-parent - 2.7.1-SNAPSHOT + 2.7.0.1 tools diff --git a/chutney/ui/pom.xml b/chutney/ui/pom.xml index 7e0596f99..df7e0ef8e 100644 --- a/chutney/ui/pom.xml +++ b/chutney/ui/pom.xml @@ -6,7 +6,7 @@ com.chutneytesting chutney-parent - 2.7.1-SNAPSHOT + 2.7.0.1 ui diff --git a/idea-plugin/gradle.properties b/idea-plugin/gradle.properties index 27bd9c07c..55c5ce466 100755 --- a/idea-plugin/gradle.properties +++ b/idea-plugin/gradle.properties @@ -7,7 +7,7 @@ org.gradle.jvmargs=-Xmx2048M pluginGroup = com.chutneytesting.idea pluginName = chutney-idea-plugin -chutneyVersion = 2.7.1-SNAPSHOT +chutneyVersion = 2.7.0.1 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # for insight into build numbers and IntelliJ Platform versions. diff --git a/kotlin-dsl/gradle.properties b/kotlin-dsl/gradle.properties index 7be45d0ec..46a349c57 100644 --- a/kotlin-dsl/gradle.properties +++ b/kotlin-dsl/gradle.properties @@ -1 +1 @@ -chutneyVersion = 2.7.1-SNAPSHOT +chutneyVersion = 2.7.0.1