[jb] fix platform version range for stable GW plugin (gitpod-io#17104)

HQ1363 · Mar 31, 2023 · 589e670 · 589e670
1 parent 8f5eac4
commit 589e670
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/jetbrains-integration-test.yml b/.github/workflows/jetbrains-integration-test.yml
@@ -68,8 +68,14 @@ jobs:
           sudo update-rc.d xvfb defaults
           sudo service xvfb start
       - name: Get leeway cache version
+        env:
+          TEST_USE_LATEST: ${{ inputs.use_latest }}
         run: |
-          leeway collect | grep components/ide/jetbrains/gateway-plugin:publish-latest > gateway.version
+          if [ $TEST_USE_LATEST = "false" ]; then
+            leeway collect | grep components/ide/jetbrains/gateway-plugin:publish-stable > gateway.version
+          else
+            leeway collect | grep components/ide/jetbrains/gateway-plugin:publish-latest > gateway.version
+          fi
       - name: Cache leeway build
         id: cache-npm
         uses: actions/cache@v3

diff --git a/.github/workflows/jetbrains-update-plugin-platform-template.yml b/.github/workflows/jetbrains-update-plugin-platform-template.yml
@@ -56,13 +56,16 @@ jobs:
                 echo "MINOR: $MINOR"
                 LATEST_VERSION="$MAJOR.$MINOR-EAP-CANDIDATE-SNAPSHOT"
                 echo "Latest platform version: $LATEST_VERSION"
-                echo "::set-output name=result::$LATEST_VERSION"
+
+                echo "::set-output name=sinceBuild::$MAJOR.$MINOR"
+                echo "::set-output name=untilBuild::$MAJOR.*"
                 echo "::set-output name=majorVersion::$MAJOR_VERSION"
+                echo "::set-output name=result::$LATEST_VERSION"
             - name: Update ${{ inputs.gradlePropertiesPath }}
               if: ${{ steps.latest-version.outputs.result != steps.current-version.outputs.result }}
               run: |
-                  PLUGIN_SINCE_BUILD=$(echo "${{ steps.latest-version.outputs.result }}" | sed 's/-EAP-CANDIDATE-SNAPSHOT//' | sed 's/-CUSTOM-SNAPSHOT//')
-                  sed -i "s/pluginSinceBuild=.*/pluginSinceBuild=$PLUGIN_SINCE_BUILD/" ${{ inputs.gradlePropertiesPath }}
+                  sed -i "s/pluginSinceBuild=.*/pluginSinceBuild=${{ steps.latest-version.outputs.sinceBuild }}/" ${{ inputs.gradlePropertiesPath }}
+                  sed -i "s/pluginUntilBuild=.*/pluginUntilBuild=${{ steps.latest-version.outputs.untilBuild }}/" ${{ inputs.gradlePropertiesPath }}
                   sed -i "s/pluginVerifierIdeVersions=.*/pluginVerifierIdeVersions=${{ steps.latest-version.outputs.majorVersion }}/" ${{ inputs.gradlePropertiesPath }}
                   sed -i 's/platformVersion=${{ steps.current-version.outputs.result }}/platformVersion=${{ steps.latest-version.outputs.result }}/' ${{ inputs.gradlePropertiesPath }}
                   git diff