From 7be9099fb4a8fba2fcce3c361f7237802a6a4f1a Mon Sep 17 00:00:00 2001 From: xterao Date: Mon, 31 Mar 2025 19:01:15 +0900 Subject: [PATCH 1/3] Change version 0.4.0 --- .github/workflows/build.yml | 2 +- gradle.properties | 2 +- .../org/domaframework/doma/intellij/common/PluginUtil.kt | 2 +- src/main/resources/logback-test.xml | 6 +++--- src/main/resources/logback.xml | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c5c98c74..93136222 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,7 +72,7 @@ jobs: run: ./gradlew build -x test - name: Build plugin - run: ./gradlew buildPlugin -PpluginVersion=0.3.2-${{ github.run_number }} + run: ./gradlew buildPlugin -PpluginVersion=0.4.0-${{ github.run_number }} - name: Prepare Plugin Artifact id: artifact diff --git a/gradle.properties b/gradle.properties index c85b89f3..285fb783 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ pluginGroup = org.domaframework.doma.intellij pluginName = Doma Tools for IntelliJ pluginRepositoryUrl = https://github.com/domaframework/doma-tools-for-intellij -pluginVersion = 0.3.2 +pluginVersion = 0.4.0 pluginSinceBuild=231 diff --git a/src/main/kotlin/org/domaframework/doma/intellij/common/PluginUtil.kt b/src/main/kotlin/org/domaframework/doma/intellij/common/PluginUtil.kt index 643c942a..17976154 100644 --- a/src/main/kotlin/org/domaframework/doma/intellij/common/PluginUtil.kt +++ b/src/main/kotlin/org/domaframework/doma/intellij/common/PluginUtil.kt @@ -19,7 +19,7 @@ import com.intellij.ide.plugins.PluginManagerCore import com.intellij.openapi.extensions.PluginId const val PLUGIN_ID = "org.domaframework.doma.intellij" -const val PLUGIN_VERSION = "0.3.2" +const val PLUGIN_VERSION = "0.4.0" open class PluginUtil { companion object { diff --git a/src/main/resources/logback-test.xml b/src/main/resources/logback-test.xml index 1498a2d3..9d939c14 100644 --- a/src/main/resources/logback-test.xml +++ b/src/main/resources/logback-test.xml @@ -2,7 +2,7 @@ - + @@ -14,9 +14,9 @@ - ${LOG_FILE_BASE_DIR:-/domatoolslog}/${LOG_FILE_BASENAME:-doma-tools}-${LOG_FILE_VERSION:-0.3.2}.log + ${LOG_FILE_BASE_DIR:-/domatoolslog}/${LOG_FILE_BASENAME:-doma-tools}-${LOG_FILE_VERSION:-0.4.0}.log - ${LOG_FILE_BASE_DIR:-/domatoolslog}/${LOG_FILE_BASENAME:-doma-tools}-${LOG_FILE_VERSION:-0.3.2}-%d{yyyy-MM-dd}.log + ${LOG_FILE_BASE_DIR:-/domatoolslog}/${LOG_FILE_BASENAME:-doma-tools}-${LOG_FILE_VERSION:-0.4.0}-%d{yyyy-MM-dd}.log 30 diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 1498a2d3..9d939c14 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -2,7 +2,7 @@ - + @@ -14,9 +14,9 @@ - ${LOG_FILE_BASE_DIR:-/domatoolslog}/${LOG_FILE_BASENAME:-doma-tools}-${LOG_FILE_VERSION:-0.3.2}.log + ${LOG_FILE_BASE_DIR:-/domatoolslog}/${LOG_FILE_BASENAME:-doma-tools}-${LOG_FILE_VERSION:-0.4.0}.log - ${LOG_FILE_BASE_DIR:-/domatoolslog}/${LOG_FILE_BASENAME:-doma-tools}-${LOG_FILE_VERSION:-0.3.2}-%d{yyyy-MM-dd}.log + ${LOG_FILE_BASE_DIR:-/domatoolslog}/${LOG_FILE_BASENAME:-doma-tools}-${LOG_FILE_VERSION:-0.4.0}-%d{yyyy-MM-dd}.log 30 From 9ccdb2951bfedd6d1a8feb3ad23343a277bd6f14 Mon Sep 17 00:00:00 2001 From: xterao Date: Mon, 31 Mar 2025 19:26:16 +0900 Subject: [PATCH 2/3] Get the build version from the latest release draft --- .github/workflows/build.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 93136222..4fc34b6d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,8 +71,26 @@ jobs: - name: Build Gradle run: ./gradlew build -x test + - name: Get latest draft release title + run: | + TITLE=$(gh api repos/${{ github.repository }}/releases \ + --jq '.[] | select(.draft==true) | .name' | head -n 1) + if [[ -z "$TITLE" ]]; then + echo "No draft release found." + exit 1 + fi + VERSION=$(echo "$TITLE" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+') + if [[ -z "$VERSION" ]]; then + echo "No version found in version." + exit 1 + fi + echo "Extracted version: $VERSION" + echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Build plugin - run: ./gradlew buildPlugin -PpluginVersion=0.4.0-${{ github.run_number }} + run: ./gradlew buildPlugin -PpluginVersion=$RELEASE_VERSION-${{ github.run_number }} - name: Prepare Plugin Artifact id: artifact From 31cf4db21f3751344cbb2a25308940ffada83a73 Mon Sep 17 00:00:00 2001 From: xterao Date: Mon, 7 Apr 2025 09:48:00 +0900 Subject: [PATCH 3/3] Do not update version information --- gradle.properties | 2 +- .../org/domaframework/doma/intellij/common/PluginUtil.kt | 2 +- src/main/resources/logback-test.xml | 6 +++--- src/main/resources/logback.xml | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 285fb783..c85b89f3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ pluginGroup = org.domaframework.doma.intellij pluginName = Doma Tools for IntelliJ pluginRepositoryUrl = https://github.com/domaframework/doma-tools-for-intellij -pluginVersion = 0.4.0 +pluginVersion = 0.3.2 pluginSinceBuild=231 diff --git a/src/main/kotlin/org/domaframework/doma/intellij/common/PluginUtil.kt b/src/main/kotlin/org/domaframework/doma/intellij/common/PluginUtil.kt index 17976154..643c942a 100644 --- a/src/main/kotlin/org/domaframework/doma/intellij/common/PluginUtil.kt +++ b/src/main/kotlin/org/domaframework/doma/intellij/common/PluginUtil.kt @@ -19,7 +19,7 @@ import com.intellij.ide.plugins.PluginManagerCore import com.intellij.openapi.extensions.PluginId const val PLUGIN_ID = "org.domaframework.doma.intellij" -const val PLUGIN_VERSION = "0.4.0" +const val PLUGIN_VERSION = "0.3.2" open class PluginUtil { companion object { diff --git a/src/main/resources/logback-test.xml b/src/main/resources/logback-test.xml index 9d939c14..1498a2d3 100644 --- a/src/main/resources/logback-test.xml +++ b/src/main/resources/logback-test.xml @@ -2,7 +2,7 @@ - + @@ -14,9 +14,9 @@ - ${LOG_FILE_BASE_DIR:-/domatoolslog}/${LOG_FILE_BASENAME:-doma-tools}-${LOG_FILE_VERSION:-0.4.0}.log + ${LOG_FILE_BASE_DIR:-/domatoolslog}/${LOG_FILE_BASENAME:-doma-tools}-${LOG_FILE_VERSION:-0.3.2}.log - ${LOG_FILE_BASE_DIR:-/domatoolslog}/${LOG_FILE_BASENAME:-doma-tools}-${LOG_FILE_VERSION:-0.4.0}-%d{yyyy-MM-dd}.log + ${LOG_FILE_BASE_DIR:-/domatoolslog}/${LOG_FILE_BASENAME:-doma-tools}-${LOG_FILE_VERSION:-0.3.2}-%d{yyyy-MM-dd}.log 30 diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 9d939c14..1498a2d3 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -2,7 +2,7 @@ - + @@ -14,9 +14,9 @@ - ${LOG_FILE_BASE_DIR:-/domatoolslog}/${LOG_FILE_BASENAME:-doma-tools}-${LOG_FILE_VERSION:-0.4.0}.log + ${LOG_FILE_BASE_DIR:-/domatoolslog}/${LOG_FILE_BASENAME:-doma-tools}-${LOG_FILE_VERSION:-0.3.2}.log - ${LOG_FILE_BASE_DIR:-/domatoolslog}/${LOG_FILE_BASENAME:-doma-tools}-${LOG_FILE_VERSION:-0.4.0}-%d{yyyy-MM-dd}.log + ${LOG_FILE_BASE_DIR:-/domatoolslog}/${LOG_FILE_BASENAME:-doma-tools}-${LOG_FILE_VERSION:-0.3.2}-%d{yyyy-MM-dd}.log 30