From 04c8157ee5c8b15fd9398675eae64007e275e6ec Mon Sep 17 00:00:00 2001 From: Andrew Kozlov Date: Tue, 3 Feb 2026 14:32:27 +0100 Subject: [PATCH 1/2] versions updated, compilation fixed --- .github/workflows/publish.yaml | 4 ++-- .idea/vcs.xml | 4 ++++ gradle-252.properties | 3 --- gradle-253.properties | 3 --- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index d607b809b3..60318e1612 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -16,8 +16,8 @@ jobs: strategy: matrix: environmentName: - - 251 - 252 + - 253 fail-fast: false steps: - uses: actions/checkout@v4 @@ -46,8 +46,8 @@ jobs: strategy: matrix: environmentName: - - 251 - 252 + - 253 fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 7aedeff107..61a0c42b4f 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -25,6 +25,10 @@ diff --git a/gradle-252.properties b/gradle-252.properties index e7bec3895d..ad938a0cf0 100644 --- a/gradle-252.properties +++ b/gradle-252.properties @@ -8,6 +8,3 @@ ideaVersion=IU-2025.2.4 clionVersion=CL-2025.2.4 pycharmVersion=PC-2025.2.4 riderVersion=RD-2025.2.4 -# for running idea, pycharm, webstorm or android studio with plugins locally -# Path to pre-built plugin ZIP for runIde tasks (optional, overrides building from source) -localPluginPath=/Users/alexanderpetrov/Downloads/JetBrainsAcademy-2025.11-2025.2-994.zip diff --git a/gradle-253.properties b/gradle-253.properties index 6b9a0c1e5c..7bd02e5ad5 100644 --- a/gradle-253.properties +++ b/gradle-253.properties @@ -8,6 +8,3 @@ ideaVersion=IU-2025.3 clionVersion=CL-2025.3 pycharmVersion=PC-2025.3 riderVersion=RD-2025.3 -# for running idea, pycharm, webstorm or android studio with plugins locally -# Path to pre-built plugin ZIP for runIde tasks (optional, overrides building from source) -localPluginPath=/Users/alexanderpetrov/Downloads/JetBrainsAcademy-2025.11-2025.3-329.zip From f62b0af431c49710134fba1733839fa66b7adade Mon Sep 17 00:00:00 2001 From: Andrew Kozlov Date: Fri, 20 Feb 2026 18:52:37 +0100 Subject: [PATCH 2/2] plugin build publishing script --- .github/workflows/publish.yaml | 96 ++++++++++++---------------------- gradle.properties | 6 ++- 2 files changed, 39 insertions(+), 63 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 60318e1612..9e54f1b438 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -1,16 +1,15 @@ -name: Publish to JetBrains Marketplace +name: Plugin deployment on: - push: + pull_request: concurrency: group: publish-plugin-${{ github.ref_name }} cancel-in-progress: true - jobs: - test: - name: Run Tests for ${{ matrix.environmentName }} + deploy: + name: Deploy the plugin for ${{ matrix.environmentName }} runs-on: arc-runners-large timeout-minutes: 60 strategy: @@ -20,73 +19,46 @@ jobs: - 253 fail-fast: false steps: - - uses: actions/checkout@v4 + - name: Checkout code + uses: actions/checkout@v4 with: fetch-depth: 1 - - uses: actions/setup-java@v4 + - name: Setup Coretto JDK + uses: actions/setup-java@v4 with: java-version-file: '.java-version' distribution: 'corretto' cache: 'gradle' - - name: Run Tests - env: - GRADLE_OPTS: "-Xmx2g -XX:MaxMetaspaceSize=512m -Dkotlin.daemon.jvm.options=-Xmx1g" - run: | - echo "environmentName=${{ matrix.environmentName }}" - ./gradlew test \ - --parallel -Dorg.gradle.workers.max=2 -Dorg.gradle.test.worker.max=2 \ - --no-daemon -PenvironmentName=${{ matrix.environmentName }} + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 - verify: - name: Verify Plugin for ${{ matrix.environmentName }} - runs-on: arc-runners-large - timeout-minutes: 60 - strategy: - matrix: - environmentName: - - 252 - - 253 - fail-fast: false - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 1 + - name: Generate timestamp + run: echo "VERSION=$(date +'%Y.%m.%d-%H%M')" >> $GITHUB_ENV - - uses: actions/setup-java@v4 + - name: Build plugin + run: ./gradlew buildPlugin -PenvironmentName=${{ matrix.environmentName }} -PpluginVersion=${{ env.VERSION }} + + - name: Upload plugin to PR + uses: actions/upload-artifact@v4 with: - java-version-file: '.java-version' - distribution: 'corretto' - cache: 'gradle' + name: HyperskillAcademy-${{ env.VERSION }}-${{ matrix.environmentName }} + path: intellij-plugin/build/distributions + retention-days: 3 - - name: Verify Plugin - env: - GRADLE_OPTS: "-Xmx2g -XX:MaxMetaspaceSize=512m -Dkotlin.daemon.jvm.options=-Xmx1g" - run: | - echo "environmentName=${{ matrix.environmentName }}" - ./gradlew verifyPlugin \ - --parallel -Dorg.gradle.workers.max=2 -Dorg.gradle.test.worker.max=2 \ - --no-daemon -PenvironmentName=${{ matrix.environmentName }} + - name: Run tests + continue-on-error: true + run: ./gradlew test -PenvironmentName=${{ matrix.environmentName }} -PpluginVersion=${{ env.VERSION }} -# publish: -# name: Publish Plugin -# if: github.ref == 'refs/heads/main' && github.event_name == 'push' -# runs-on: arc-runners-large -# needs: -# - test -# - verify -# timeout-minutes: 30 -# steps: -# - uses: actions/checkout@v4 -# -# - uses: actions/setup-java@v4 -# with: -# java-version-file: '.java-version' -# distribution: 'corretto' -# -# - name: Publish Plugin -# run: | -# ./gradlew publishPlugin --no-daemon -# env: -# JB_MARKETPLACE_TOKEN: ${{ secrets.JB_MARKETPLACE_TOKEN }} + - name: Verify plugin + run: ./gradlew verifyPlugin -PenvironmentName=${{ matrix.environmentName }} -PpluginVersion=${{ env.VERSION }} + + - name: Upload plugin to Marketplace + if: github.ref == 'refs/heads/main' && + github.event_name == 'push' && + steps.run-tests.outcome == 'success' + continue-on-error: true + run: ./gradlew publishPlugin -PenvironmentName=${{ matrix.environmentName }} -PpluginVersion=${{ env.VERSION }} + env: + JB_MARKETPLACE_TOKEN: ${{ secrets.JB_MARKETPLACE_TOKEN }} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index bf616d456b..ed8690cfff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,7 +28,8 @@ enableBuildSearchableOptions=false # Note, remove `-` before build number (`b` letter) to make it work #jbrVersion=17.0.11b1207.24 -org.gradle.jvmargs=-Xmx2g +org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m +kotlin.daemon.jvm.options=-Xmx1g # Since kotlin 1.4, stdlib dependency is added by default by kotlin gradle plugin. # But we don't need it because all necessary kotlin libraries are already bundled into IDE. @@ -46,3 +47,6 @@ publishingVersion= # Build speed optimizations kotlin.incremental=true org.gradle.parallel=true +org.gradle.daemon=false +org.gradle.workers.max=2 +org.gradle.test.worker.max=2 \ No newline at end of file