Skip to content

Commit

Permalink
#318 Try to find files in current directory
Browse files Browse the repository at this point in the history
  • Loading branch information
ascheman committed Aug 21, 2024
1 parent 2ed5d97 commit e5b31b8
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/test-java-os-mix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,19 @@ jobs:
./gradlew --version
./gradlew htmlSanityCheck --scan
- name: Execute integration test (Windows)
if: runner.os == 'Windows'
shell: pwsh
run: |
uname -a
cmd /c "echo off && gradlew.bat --version"
cmd /c "echo off && gradlew.bat info"
cmd /c "echo off && gradlew.bat integrationTestOnly --scan"
# If we ever need to debug the file system contents
# Get-ChildItem -Recurse -File | Format-Table Name, Length, LastWriteTime
# Get-ChildItem -Recurse -File ./integration-test | Format-Table Name, Length, LastWriteTime

- name: Collect state upon failure
if: failure()
run: |
Expand Down
8 changes: 6 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,12 @@ tasks.register("integrationTestCliOnly") {
workingDir INTEGRATION_TEST_DIRECTORY_CLI
file(BUILD_REPORTS_DIRECTORY).mkdirs()
String hscScriptFileName = "../../htmlSanityCheck-cli/${Project.DEFAULT_BUILD_DIR_NAME}/install/hsc/bin/hsc"
commandLine System.getProperty("os.name") ==~ /Windows.*/ ? "${hscScriptFileName.replace('/', '\\')}.bat" : hscScriptFileName,
"-r", BUILD_REPORTS_DIRECTORY, "../common/src/test/resources"
String params = "-r ${BUILD_REPORTS_DIRECTORY} ../common/src/test/resources"
if (System.getProperty("os.name") ==~ /Windows.*/) {
commandLine 'cmd', '/c', "echo off && ${hscScriptFileName.replace('/', '\\')}.bat ${params}"
} else {
commandLine 'sh', '-c', "${hscScriptFileName} ${params}"
}
}
logger.debug "Script output: ${result}"
assert testIndex.exists()
Expand Down

0 comments on commit e5b31b8

Please sign in to comment.