From 79e44676d0587984a1fd484bc4b4ec6dafda1322 Mon Sep 17 00:00:00 2001 From: Timo Drick Date: Mon, 7 Jul 2025 18:53:45 +0200 Subject: [PATCH 1/5] Moved secrets into inputs for github action --- .../actions/plugin-publish-steps/action.yml | 20 +++++++++++++++---- .github/workflows/plugin-manual.yml | 4 ++++ .github/workflows/plugin-release.yml | 6 +++++- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.github/actions/plugin-publish-steps/action.yml b/.github/actions/plugin-publish-steps/action.yml index 5a57411..0006558 100644 --- a/.github/actions/plugin-publish-steps/action.yml +++ b/.github/actions/plugin-publish-steps/action.yml @@ -8,6 +8,18 @@ inputs: channel: description: 'The channel to publish the plugin to' required: true + PLUGIN_CERTIFICATE_CHAIN: + description: 'The certificate chain for signing the plugin' + required: true + PLUGIN_PRIVATE_KEY: + description: 'The private key for signing the plugin' + required: true + PLUGIN_PRIVATE_KEY_PASSWORD: + description: 'The password for the private key' + required: true + PLUGIN_PUBLISH_TOKEN: + description: 'The token for publishing the plugin to the marketplace' + required: true runs: using: "composite" @@ -17,16 +29,16 @@ runs: - name: Sign Plugin env: - PLUGIN_CERTIFICATE_CHAIN: ${{ secrets.PLUGIN_CERTIFICATE_CHAIN }} - PLUGIN_PRIVATE_KEY: ${{ secrets.PLUGIN_PRIVATE_KEY }} - PLUGIN_PRIVATE_KEY_PASSWORD: ${{ secrets.PLUGIN_PRIVATE_KEY_PASSWORD }} + PLUGIN_CERTIFICATE_CHAIN: ${{ inputs.PLUGIN_CERTIFICATE_CHAIN }} + PLUGIN_PRIVATE_KEY: ${{ inputs.PLUGIN_PRIVATE_KEY }} + PLUGIN_PRIVATE_KEY_PASSWORD: ${{ inputs.PLUGIN_PRIVATE_KEY_PASSWORD }} run: ./gradlew :plugin-251:signPlugin shell: bash working-directory: ./intellij-plugin - name: Release to plugin market env: - PLUGIN_PUBLISH_TOKEN: ${{ secrets.PLUGIN_PUBLISH_TOKEN }} + PLUGIN_PUBLISH_TOKEN: ${{ inputs.PLUGIN_PUBLISH_TOKEN }} PLUGIN_PUBLISH_CHANNEL: ${{ inputs.channel }} run: | echo "Publishing to channel: ${{ inputs.channel }}" diff --git a/.github/workflows/plugin-manual.yml b/.github/workflows/plugin-manual.yml index 328af74..cd9fa80 100644 --- a/.github/workflows/plugin-manual.yml +++ b/.github/workflows/plugin-manual.yml @@ -24,6 +24,10 @@ jobs: uses: ./.github/actions/plugin-publish-steps with: channel: ${{ inputs.channel }} + PLUGIN_CERTIFICATE_CHAIN: ${{ secrets.PLUGIN_CERTIFICATE_CHAIN }} + PLUGIN_PRIVATE_KEY: ${{ secrets.PLUGIN_PRIVATE_KEY }} + PLUGIN_PRIVATE_KEY_PASSWORD: ${{ secrets.PLUGIN_PRIVATE_KEY_PASSWORD }} + PLUGIN_PUBLISH_TOKEN: ${{ secrets.PLUGIN_PUBLISH_TOKEN }} - name: Finished run: | diff --git a/.github/workflows/plugin-release.yml b/.github/workflows/plugin-release.yml index 58b92ad..f8c28ce 100644 --- a/.github/workflows/plugin-release.yml +++ b/.github/workflows/plugin-release.yml @@ -22,8 +22,12 @@ jobs: uses: ./.github/actions/plugin-publish-steps with: channel: "default" + PLUGIN_CERTIFICATE_CHAIN: ${{ secrets.PLUGIN_CERTIFICATE_CHAIN }} + PLUGIN_PRIVATE_KEY: ${{ secrets.PLUGIN_PRIVATE_KEY }} + PLUGIN_PRIVATE_KEY_PASSWORD: ${{ secrets.PLUGIN_PRIVATE_KEY_PASSWORD }} + PLUGIN_PUBLISH_TOKEN: ${{ secrets.PLUGIN_PUBLISH_TOKEN }} - name: Finished run: | - echo "Plugin published to channel: ${{ inputs.channel }}" + echo "Plugin published to channel: default" shell: bash \ No newline at end of file From 5c0fa5c29691666feaed3d2eab0dd2473c26f534 Mon Sep 17 00:00:00 2001 From: Timo Drick Date: Mon, 7 Jul 2025 18:57:19 +0200 Subject: [PATCH 2/5] Fixed action reference --- .github/actions/plugin-publish-steps/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/plugin-publish-steps/action.yml b/.github/actions/plugin-publish-steps/action.yml index 0006558..adc32e3 100644 --- a/.github/actions/plugin-publish-steps/action.yml +++ b/.github/actions/plugin-publish-steps/action.yml @@ -25,7 +25,7 @@ runs: using: "composite" steps: - id: build - uses: action.yml + uses: ./.github/actions/plugin-build-steps - name: Sign Plugin env: From 03b20b976c04c67ea025e3bbf531c1ca6029e6f5 Mon Sep 17 00:00:00 2001 From: Timo Drick Date: Mon, 7 Jul 2025 19:08:47 +0200 Subject: [PATCH 3/5] Activated real publishing --- .github/actions/plugin-publish-steps/action.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/actions/plugin-publish-steps/action.yml b/.github/actions/plugin-publish-steps/action.yml index adc32e3..60a252b 100644 --- a/.github/actions/plugin-publish-steps/action.yml +++ b/.github/actions/plugin-publish-steps/action.yml @@ -40,8 +40,6 @@ runs: env: PLUGIN_PUBLISH_TOKEN: ${{ inputs.PLUGIN_PUBLISH_TOKEN }} PLUGIN_PUBLISH_CHANNEL: ${{ inputs.channel }} - run: | - echo "Publishing to channel: ${{ inputs.channel }}" - #run: ./gradlew :plugin-251:publishPlugin + run: ./gradlew :plugin-251:publishPlugin shell: bash working-directory: ./intellij-plugin \ No newline at end of file From 69ef78649314d2cadfc078163e615dcdfd92e552 Mon Sep 17 00:00:00 2001 From: Timo Drick Date: Tue, 8 Jul 2025 10:49:43 +0200 Subject: [PATCH 4/5] Fixed plugin id issue --- .gitignore | 3 ++- intellij-plugin/gradle.properties | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3ef3bd4..4c3f293 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea/ /build .kotlin -.gradle \ No newline at end of file +.gradle +.local/ \ No newline at end of file diff --git a/intellij-plugin/gradle.properties b/intellij-plugin/gradle.properties index 6664230..c3c6643 100644 --- a/intellij-plugin/gradle.properties +++ b/intellij-plugin/gradle.properties @@ -1,5 +1,6 @@ # Additional plugin properties are set in */plugin.properties for each target IJP pluginGroup=de.drick.compose.hotpreview.plugin +pluginId=de.drick.compose.hotpreview.plugin pluginName=Compose Multiplatform HotPreview" pluginRepositoryUrl=https://github.com/rock3r/jewel-ijp-template pluginVersion=0.9.0 From eafa88366bcef6ab53a2ec7455fa32249e797944 Mon Sep 17 00:00:00 2001 From: Timo Drick Date: Tue, 8 Jul 2025 10:51:08 +0200 Subject: [PATCH 5/5] Removed double dependency from plugin.xml --- .../plugin-251/src/main/resources/META-INF/plugin.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/intellij-plugin/plugin-251/src/main/resources/META-INF/plugin.xml b/intellij-plugin/plugin-251/src/main/resources/META-INF/plugin.xml index 047835a..a28ff37 100644 --- a/intellij-plugin/plugin-251/src/main/resources/META-INF/plugin.xml +++ b/intellij-plugin/plugin-251/src/main/resources/META-INF/plugin.xml @@ -2,7 +2,6 @@ -