From f9fca8690de7669ce5bcf6c0d21dea457845f378 Mon Sep 17 00:00:00 2001
From: Jakub Chrzanowski <jakub.chrzanowski@jetbrains.com>
Date: Fri, 31 Jul 2020 13:14:35 +0200
Subject: [PATCH] Verifier fix (#19)

- run plugin verifier against 2019.3 2020.1 2020.2
- Plugin Verifier broken for artifacts with whitespaces in name
---
 .github/workflows/build.yml | 18 ++++++++++--------
 CHANGELOG.md                |  3 +++
 gradle.properties           |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 115b2b7..3d36b5b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -78,8 +78,8 @@ jobs:
     outputs:
       name: ${{ steps.properties.outputs.name }}
       version: ${{ steps.properties.outputs.version }}
-      artifact: ${{ steps.properties.outputs.name }}-${{ steps.properties.outputs.version }}.zip
       changelog: ${{ steps.properties.outputs.changelog }}
+      artifact: ${{ steps.properties.outputs.artifact }}
     steps:
 
       # Check out current repository
@@ -104,14 +104,15 @@ jobs:
       - name: Export Properties
         id: properties
         run: |
-          echo "::set-output name=version::$(./gradlew properties --console=plain -q | grep "^version:" | cut -f2- -d ' ')"
-          echo "::set-output name=name::$(./gradlew properties --console=plain -q | grep "^name:" | cut -f2- -d ' ')"
+          VERSION="$(./gradlew properties --console=plain -q | grep "^version:" | cut -f2- -d ' ')"
+          NAME="$(./gradlew properties --console=plain -q | grep "^name:" | cut -f2- -d ' ')"
+          CHANGELOG=$(./gradlew getChangelog --unreleased --no-header --console=plain -q | jq -sRr @uri)
+          ARTIFACT="${NAME}-${VERSION}.zip"
 
-          CHANGELOG=$(./gradlew getChangelog --unreleased --no-header --console=plain -q)
-          CHANGELOG="${CHANGELOG//'%'/'%25'}"
-          CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
-          CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
+          echo "::set-output name=version::$VERSION"
+          echo "::set-output name=name::$NAME"
           echo "::set-output name=changelog::$CHANGELOG"
+          echo "::set-output name=artifact::$ARTIFACT"
 
       # Build artifact using buildPlugin Gradle task
       - name: Build Plugin
@@ -143,7 +144,7 @@ jobs:
         id: verify
         uses: ChrisCarini/intellij-platform-plugin-verifier-action@v0.0.2
         with:
-          plugin-location: plugin-artifact/${{ needs.build.outputs.artifact }}
+          plugin-location: plugin-artifact/*.zip
           ide-versions: |
             ideaIC:2019.3
             ideaIC:2020.1
@@ -151,6 +152,7 @@ jobs:
 
       # Print the output of the verify step
       - name: Print Logs
+        if: ${{ always() }}
         env:
           OUTPUT_LOG: ${{ steps.verify.outputs.verification-output-log-filename }}
         run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b3e948..00cf095 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@
 ### Changed
 - GitHub Actions - run plugin verifier against 2019.3 2020.1 2020.2
 
+### Fixed
+- GitHub Actions - Plugin Verifier broken for artifacts with whitespaces in name
+
 ## [0.3.0]
 ### Added
 - Set publish channel depending on the plugin version, i.e. `1.0.0-beta` -> `beta` channel
diff --git a/gradle.properties b/gradle.properties
index 46f74df..f7638d4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@
 
 pluginGroup = org.jetbrains.plugins.template
 pluginName = Template
-pluginVersion = 0.3.0
+pluginVersion = 0.3.1
 pluginSinceBuild = 193
 pluginUntilBuild = 202.*