From 293361fa80b4f56a34d63c101e65ff03b1d5bf47 Mon Sep 17 00:00:00 2001 From: Vladimir Sitnikov Date: Thu, 20 Nov 2025 08:21:33 +0300 Subject: [PATCH 1/5] chore: bump asf-release-environment config --- .github/workflows/release-test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml index 83333315..ca4f112d 100644 --- a/.github/workflows/release-test.yml +++ b/.github/workflows/release-test.yml @@ -37,7 +37,7 @@ jobs: git clone --depth 100 https://github.com/vlsi/asflike-release-environment.git ../asflike-release-environment cd ../asflike-release-environment cp .env_calcite-avatica .env - docker compose build vcs + docker compose build svn git docker compose up -d - name: 'Clone Calcite Avatica' run: | @@ -83,7 +83,7 @@ jobs: git clone --depth 100 https://github.com/vlsi/asflike-release-environment.git ../asflike-release-environment cd ../asflike-release-environment cp .env_calcite .env - docker compose build vcs + docker compose build svn git docker compose up -d - name: 'Clone Calcite' run: | @@ -129,7 +129,7 @@ jobs: git clone --depth 100 https://github.com/vlsi/asflike-release-environment.git ../asflike-release-environment cd ../asflike-release-environment cp .env_jmeter .env - docker compose build vcs + docker compose build svn git docker compose up -d - name: 'Clone JMeter' run: | @@ -140,7 +140,7 @@ jobs: with: gradle-version: ${{ matrix.gradle-version }} build-root-directory: ../jmeter - arguments: --no-parallel --no-daemon prepareVote -Prc=1 -PlocalReleasePlugins -PasfTestNexusUsername=test -PasfTestNexusPassword=test -PasfTestGitSourceUsername=test -PasfTestGitSourcePassword=test -PasfTestSvnUsername=test -PasfTestSvnPassword=test -PasfTestGitSitePreviewUsername=test -PasfTestGitSitePreviewPassword=test -Psigning.gnupg.keyName=289023DE2663BD17 -PuseGpgCmd -Psigning.gnupg.useLegacyGpg=true + arguments: --dependency-verification off --no-parallel --no-daemon prepareVote -Prc=1 -PlocalReleasePlugins -PasfTestNexusUsername=test -PasfTestNexusPassword=test -PasfTestGitSourceUsername=test -PasfTestGitSourcePassword=test -PasfTestSvnUsername=test -PasfTestSvnPassword=test -PasfTestGitSitePreviewUsername=test -PasfTestGitSitePreviewPassword=test -Psigning.gnupg.keyName=289023DE2663BD17 -PuseGpgCmd -Psigning.gnupg.useLegacyGpg=true env: ORG_GRADLE_PROJECT_checksumIgnore: true - name: 'Publish Release' @@ -148,6 +148,6 @@ jobs: with: gradle-version: ${{ matrix.gradle-version }} build-root-directory: ../jmeter - arguments: --no-parallel --no-daemon publishDist -Prc=1 -PlocalReleasePlugins -PasfTestNexusUsername=test -PasfTestNexusPassword=test -PasfTestGitSourceUsername=test -PasfTestGitSourcePassword=test -PasfTestSvnUsername=test -PasfTestSvnPassword=test + arguments: --dependency-verification off --no-parallel --no-daemon publishDist -Prc=1 -PlocalReleasePlugins -PasfTestNexusUsername=test -PasfTestNexusPassword=test -PasfTestGitSourceUsername=test -PasfTestGitSourcePassword=test -PasfTestSvnUsername=test -PasfTestSvnPassword=test env: ORG_GRADLE_PROJECT_checksumIgnore: true From ce060ee3d6f4a7b0377d4615ac0c5428faa97418 Mon Sep 17 00:00:00 2001 From: Vladimir Sitnikov Date: Thu, 20 Nov 2025 09:14:01 +0300 Subject: [PATCH 2/5] chore: add language=bash to action scripts --- .github/workflows/release-test.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml index ca4f112d..b1042c7e 100644 --- a/.github/workflows/release-test.yml +++ b/.github/workflows/release-test.yml @@ -32,6 +32,7 @@ jobs: java-version: 21 distribution: 'zulu' - name: 'Start release environment' + # language=bash run: | gpg --import .github/workflows/test-key.asc git clone --depth 100 https://github.com/vlsi/asflike-release-environment.git ../asflike-release-environment @@ -40,6 +41,7 @@ jobs: docker compose build svn git docker compose up -d - name: 'Clone Calcite Avatica' + # language=bash run: | git clone --depth 100 https://github.com/apache/calcite-avatica.git ../calcite-avatica git rev-parse HEAD @@ -78,6 +80,7 @@ jobs: java-version: 21 distribution: 'zulu' - name: 'Start release environment' + # language=bash run: | gpg --import .github/workflows/test-key.asc git clone --depth 100 https://github.com/vlsi/asflike-release-environment.git ../asflike-release-environment @@ -86,6 +89,7 @@ jobs: docker compose build svn git docker compose up -d - name: 'Clone Calcite' + # language=bash run: | git clone --depth 100 https://github.com/apache/calcite.git ../calcite git rev-parse HEAD @@ -124,6 +128,7 @@ jobs: java-version: 21 distribution: 'zulu' - name: 'Start release environment' + # language=bash run: | gpg --import .github/workflows/test-key.asc git clone --depth 100 https://github.com/vlsi/asflike-release-environment.git ../asflike-release-environment @@ -132,6 +137,7 @@ jobs: docker compose build svn git docker compose up -d - name: 'Clone JMeter' + # language=bash run: | git clone --depth 100 https://github.com/apache/jmeter.git ../jmeter git rev-parse HEAD From 5de7214c3f48f1a7e395dbb88528c98690e8d3ba Mon Sep 17 00:00:00 2001 From: Vladimir Sitnikov Date: Thu, 20 Nov 2025 09:27:43 +0300 Subject: [PATCH 3/5] chore: make ide-plugin compatible with Gradle 9 --- .../kotlin/com/github/vlsi/gradle/ide/IdeExtension.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/ide-plugin/src/main/kotlin/com/github/vlsi/gradle/ide/IdeExtension.kt b/plugins/ide-plugin/src/main/kotlin/com/github/vlsi/gradle/ide/IdeExtension.kt index 26d2fa1a..af226c5f 100644 --- a/plugins/ide-plugin/src/main/kotlin/com/github/vlsi/gradle/ide/IdeExtension.kt +++ b/plugins/ide-plugin/src/main/kotlin/com/github/vlsi/gradle/ide/IdeExtension.kt @@ -28,6 +28,7 @@ import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.configure import org.gradle.plugins.ide.eclipse.model.EclipseModel import org.gradle.plugins.ide.idea.model.IdeaModel +import org.gradle.plugins.ide.idea.model.IdeaModule import org.gradle.util.GradleVersion import org.jetbrains.gradle.ext.ProjectSettings import java.io.File @@ -111,8 +112,11 @@ open class IdeExtension(private val project: Project) { if (GradleVersion.current() >= GradleVersion.version("7.4")) { module.testSources.from(generationOutput) } else { - @Suppress("DEPRECATION") - module.testSourceDirs.add(generationOutput) + val getTestSourceDirs = + IdeaModule::class.java.getDeclaredMethod("getTestSourceDirs") + @Suppress("UNCHECKED_CAST") + val testSourceDirs = getTestSourceDirs.invoke(module) as MutableSet + testSourceDirs.add(generationOutput) } } } From 90047eed54e5268ed94cb55520a6551fefd51136 Mon Sep 17 00:00:00 2001 From: Vladimir Sitnikov Date: Thu, 20 Nov 2025 09:36:30 +0300 Subject: [PATCH 4/5] chore: rc -> release-candidate --- .github/workflows/release-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml index b1042c7e..64a4aa31 100644 --- a/.github/workflows/release-test.yml +++ b/.github/workflows/release-test.yml @@ -114,7 +114,7 @@ jobs: strategy: fail-fast: false matrix: - gradle-version: [wrapper, rc, nightly] + gradle-version: [wrapper, release-candidate, nightly] name: 'JMeter ${{ matrix.gradle-version }}' runs-on: ubuntu-latest steps: From 5e58855b493cd40f4455d466a0902a3e639f1466 Mon Sep 17 00:00:00 2001 From: Vladimir Sitnikov Date: Thu, 20 Nov 2025 10:08:58 +0300 Subject: [PATCH 5/5] chore: install svn cli for release-test action --- .github/workflows/release-test.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml index 64a4aa31..f0919498 100644 --- a/.github/workflows/release-test.yml +++ b/.github/workflows/release-test.yml @@ -13,6 +13,10 @@ on: # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/software-installed-on-github-hosted-runners +env: + # Disable Docker download progress + BUILDKIT_PROGRESS: plain + jobs: release-avatica: strategy: @@ -31,6 +35,11 @@ jobs: with: java-version: 21 distribution: 'zulu' + - name: Install SVN + # language=bash + run: | + sudo apt-get update + sudo apt-get install -y subversion - name: 'Start release environment' # language=bash run: | @@ -79,6 +88,11 @@ jobs: with: java-version: 21 distribution: 'zulu' + - name: Install SVN + # language=bash + run: | + sudo apt-get update + sudo apt-get install -y subversion - name: 'Start release environment' # language=bash run: | @@ -127,6 +141,11 @@ jobs: with: java-version: 21 distribution: 'zulu' + - name: Install SVN + # language=bash + run: | + sudo apt-get update + sudo apt-get install -y subversion - name: 'Start release environment' # language=bash run: |