Fix test sysprop name to work on Windows

This commit is contained in:
Daz DeBoer 2022-08-24 08:19:52 -06:00
parent c77676cc69
commit 6e56b59601
No known key found for this signature in database
GPG Key ID: DD6B9F0B06683D5D
3 changed files with 7 additions and 7 deletions

View File

@ -34,7 +34,7 @@ jobs:
cache-read-only: false # For testing, allow writing cache entries on non-default branches cache-read-only: false # For testing, allow writing cache entries on non-default branches
- name: Build with 3.1 - name: Build with 3.1
working-directory: test/jest/resources/cache-cleanup working-directory: test/jest/resources/cache-cleanup
run: gradle --no-daemon --build-cache -Dcommons-math3.version=3.1 build run: gradle --no-daemon --build-cache -Dcommons_math3_version=3.1 build
# Second build will use the cache from the first build, but cleanup should remove unused artifacts # Second build will use the cache from the first build, but cleanup should remove unused artifacts
assemble-build: assemble-build:
@ -55,7 +55,7 @@ jobs:
gradle-home-cache-cleanup: true gradle-home-cache-cleanup: true
- name: Build with 3.1.1 - name: Build with 3.1.1
working-directory: test/jest/resources/cache-cleanup working-directory: test/jest/resources/cache-cleanup
run: gradle --no-daemon --build-cache -Dcommons-math3.version=3.1.1 build run: gradle --no-daemon --build-cache -Dcommons_math3_version=3.1.1 build
check-clean-cache: check-clean-cache:
needs: assemble-build needs: assemble-build

View File

@ -63,17 +63,17 @@ test('will cleanup unused gradle versions', async () => {
}) })
async function runGradleBuild(projectRoot: string, args: string, version: string = '3.1'): Promise<void> { async function runGradleBuild(projectRoot: string, args: string, version: string = '3.1'): Promise<void> {
const status31 = await exec.exec(`gradle -g HOME --no-daemon --build-cache -Dcommons-math3.version=${version} ${args}`, [], { const status31 = await exec.exec(`gradle -g HOME --no-daemon --build-cache -Dcommons_math3_version=${version} ${args}`, [], {
cwd: projectRoot cwd: projectRoot
}) })
console.log(`Gradle User Home initialized with commons-math3.version=${version} ${args}`) console.log(`Gradle User Home initialized with commons_math3_version=${version} ${args}`)
} }
async function runGradleWrapperBuild(projectRoot: string, args: string, version: string = '3.1'): Promise<void> { async function runGradleWrapperBuild(projectRoot: string, args: string, version: string = '3.1'): Promise<void> {
const status31 = await exec.exec(`./gradlew -g HOME --no-daemon --build-cache -Dcommons-math3.version=${version} ${args}`, [], { const status31 = await exec.exec(`./gradlew -g HOME --no-daemon --build-cache -Dcommons_math3_version=${version} ${args}`, [], {
cwd: projectRoot cwd: projectRoot
}) })
console.log(`Gradle User Home initialized with commons-math3.version=${version} ${args}`) console.log(`Gradle User Home initialized with commons_math3_version=${version} ${args}`)
} }
function prepareTestProject(): string { function prepareTestProject(): string {

View File

@ -7,5 +7,5 @@ repositories {
} }
dependencies { dependencies {
api "org.apache.commons:commons-math3:${System.properties['commons-math3.version']}" api "org.apache.commons:commons-math3:${System.properties['commons_math3_version']}"
} }