diff --git a/.github/workflows/integ-test-cache-cleanup.yml b/.github/workflows/integ-test-cache-cleanup.yml index fbfa198..fc6f42e 100644 --- a/.github/workflows/integ-test-cache-cleanup.yml +++ b/.github/workflows/integ-test-cache-cleanup.yml @@ -34,7 +34,7 @@ jobs: cache-read-only: false # For testing, allow writing cache entries on non-default branches - name: Build with 3.1 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 assemble-build: @@ -55,7 +55,7 @@ jobs: gradle-home-cache-cleanup: true - name: Build with 3.1.1 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: needs: assemble-build diff --git a/test/jest/cache-cleanup.test.ts b/test/jest/cache-cleanup.test.ts index 937a379..28c39cd 100644 --- a/test/jest/cache-cleanup.test.ts +++ b/test/jest/cache-cleanup.test.ts @@ -63,17 +63,17 @@ test('will cleanup unused gradle versions', async () => { }) async function runGradleBuild(projectRoot: string, args: string, version: string = '3.1'): Promise { - 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 }) - 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 { - 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 }) - 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 { diff --git a/test/jest/resources/cache-cleanup/build.gradle b/test/jest/resources/cache-cleanup/build.gradle index 45be6a5..b619142 100644 --- a/test/jest/resources/cache-cleanup/build.gradle +++ b/test/jest/resources/cache-cleanup/build.gradle @@ -7,5 +7,5 @@ repositories { } dependencies { - api "org.apache.commons:commons-math3:${System.properties['commons-math3.version']}" + api "org.apache.commons:commons-math3:${System.properties['commons_math3_version']}" }