Fix tests that run on Windows

- Properly escape sysprop values
- Use bash for file existence checks
This commit is contained in:
Daz DeBoer 2022-08-24 09:02:56 -06:00
parent 6e56b59601
commit c64fe31590
No known key found for this signature in database
GPG key ID: DD6B9F0B06683D5D
2 changed files with 6 additions and 5 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
@ -75,6 +75,7 @@ jobs:
- name: Report Gradle User Home - name: Report Gradle User Home
run: du -hc ~/.gradle/caches/modules-2 run: du -hc ~/.gradle/caches/modules-2
- name: Verify cleaned cache - name: Verify cleaned cache
shell: bash
run: | run: |
if [ ! -e ~/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-math3/3.1.1 ]; then if [ ! -e ~/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-math3/3.1.1 ]; then
echo "::error ::Should find commons-math3 3.1.1 in cache" echo "::error ::Should find commons-math3 3.1.1 in cache"

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 {