Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 31 additions & 6 deletions .github/workflows/release-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -31,15 +35,22 @@ 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: |
gpg --import .github/workflows/test-key.asc
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'
# language=bash
run: |
git clone --depth 100 https://github.com/apache/calcite-avatica.git ../calcite-avatica
git rev-parse HEAD
Expand Down Expand Up @@ -77,15 +88,22 @@ 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: |
gpg --import .github/workflows/test-key.asc
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'
# language=bash
run: |
git clone --depth 100 https://github.com/apache/calcite.git ../calcite
git rev-parse HEAD
Expand All @@ -110,7 +128,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:
Expand All @@ -123,15 +141,22 @@ 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: |
gpg --import .github/workflows/test-key.asc
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'
# language=bash
run: |
git clone --depth 100 https://github.com/apache/jmeter.git ../jmeter
git rev-parse HEAD
Expand All @@ -140,14 +165,14 @@ 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'
uses: eskatos/gradle-command-action@v3
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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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<File>
testSourceDirs.add(generationOutput)
}
}
}
Expand Down
Loading