diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8264e803d..327d19465 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,6 +50,10 @@ jobs: echo "pluginVersionSemVer=$PLUGIN_VERSION_FULL" >> $GITHUB_OUTPUT echo "currCommit=$CURR_COMMIT" >> $GITHUB_OUTPUT + - name: Prepare changelog + shell: bash + run: ./gradlew patchChangelog + - name: Prepare release notes id: release_notes shell: bash @@ -103,6 +107,7 @@ jobs: | xargs -I '{}' gh api -X PATCH repos/{owner}/{repo}/milestones/{} -F state='closed' release: + needs: [changelog-and-preparations] runs-on: ubuntu-latest strategy: matrix: @@ -140,14 +145,11 @@ jobs: shell: bash run: | PROPERTIES="$(./gradlew properties --console=plain -q)" - PLUGIN_VERSION_FULL="$(echo "$PROPERTIES" | grep "^pluginVersion:" | cut -f2- -d ' ')-$PRODUCT_NAME" - CURR_COMMIT="$(git rev-parse HEAD)" + PLUGIN_VERSION="$(echo "$PROPERTIES" | grep "^pluginVersion:" | cut -f2- -d ' ')" - echo "pluginVersionFull: $PLUGIN_VERSION_FULL" - echo "currCommit: $CURR_COMMIT" + echo "pluginVersion: $PLUGIN_VERSION" - echo "pluginVersionFull=$PLUGIN_VERSION_FULL" >> $GITHUB_OUTPUT - echo "currCommit=$CURR_COMMIT" >> $GITHUB_OUTPUT + echo "pluginVersion=$PLUGIN_VERSION" >> $GITHUB_OUTPUT - name: Publish Plugin env: @@ -162,4 +164,4 @@ jobs: continue-on-error: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: gh release upload ${{ steps.properties.outputs.pluginVersionFull }} ./build/distributions/* + run: gh release upload ${{ steps.properties.outputs.pluginVersion }} ./build/distributions/* diff --git a/CHANGELOG.md b/CHANGELOG.md index 468fb0cbc..31976e6e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to the Zowe™ Explorer plug-in for IntelliJ IDEA™ will be ## [Unreleased] +### Features +* Feature: Some test feature + +### Bugfixes +* Bugfix: Some test bugfix + ## [1.2.1-231] (2024-06-12) ### Features diff --git a/build.gradle.kts b/build.gradle.kts index 002bb5bd1..77f314050 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -263,7 +263,6 @@ tasks { } publishPlugin { - dependsOn("patchChangelog") token.set(environment("ZOWE_INTELLIJ_MARKET_TOKEN").map { it }) // The pluginVersion is based on the SemVer (https://semver.org) // Read more: https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel