Skip to content

Commit 434fde2

Browse files
zspitzerzspitzer
committed
Update webroot-matrix.yml
1 parent a55a07a commit 434fde2

1 file changed

Lines changed: 31 additions & 15 deletions

File tree

‎.github/workflows/webroot-matrix.yml‎

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,17 @@ jobs:
2929
distribution: 'temurin'
3030
java-version: '17'
3131
- name: Run default test (index.cfm)
32-
run: ant -Dwebroot=webroot -Dexecute=index.cfm
32+
env:
33+
LUCEE_VERSION_QUERY: 7/all/zero
34+
run: ant -Dwebroot=webroot -Dexecute=index.cfm -DluceeVersionQuery=$LUCEE_VERSION_QUERY
3335
- name: Run subfolder test (sub/test.cfm)
34-
run: ant -Dwebroot=webroot -Dexecute=sub/test.cfm
36+
env:
37+
LUCEE_VERSION_QUERY: 7/all/zero
38+
run: ant -Dwebroot=webroot -Dexecute=sub/test.cfm -DluceeVersionQuery=$LUCEE_VERSION_QUERY
3539
- name: Run test.cfm
36-
run: ant -Dwebroot=webroot -Dexecute=test.cfm
40+
env:
41+
LUCEE_VERSION_QUERY: 7/all/zero
42+
run: ant -Dwebroot=webroot -Dexecute=test.cfm -DluceeVersionQuery=$LUCEE_VERSION_QUERY
3743
# Add more steps for other argument combinations if needed
3844
ubuntu-pwsh:
3945
name: Ubuntu PowerShell
@@ -47,15 +53,17 @@ jobs:
4753
java-version: '21'
4854
- name: Run all webroot/execute combinations
4955
shell: pwsh
56+
env:
57+
LUCEE_VERSION_QUERY: 7/all/zero
5058
run: |
5159
$webroots = @('.', './webroot', 'webroot', "${{ github.workspace }}/webroot", '"./webroot"', '"${{ github.workspace }}/webroot"')
5260
$executes = @('index.cfm', 'test.cfm', 'sub/test.cfm')
5361
foreach ($w in $webroots) {
5462
foreach ($e in $executes) {
5563
Write-Host "Testing webroot=$w execute=$e"
56-
$result = ant -buildfile build.xml -Dwebroot=$w -Dexecute="$e" -DpreCleanup=false -DpostCleanup=false 2>&1
64+
$result = ant -buildfile build.xml -Dwebroot="$w" -Dexecute="$e" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=$env:LUCEE_VERSION_QUERY 2>&1
5765
if ($LASTEXITCODE -ne 0) {
58-
$cmd = "ant -buildfile build.xml -Dwebroot=$w -Dexecute='$e' -DpreCleanup=false -DpostCleanup=false"
66+
$cmd = "ant -buildfile build.xml -Dwebroot=\"$w\" -Dexecute=\"$e\" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=$env:LUCEE_VERSION_QUERY"
5967
$platform = "macos-latest"
6068
shell: pwsh
6169
run: |
@@ -64,9 +72,9 @@ jobs:
6472
foreach ($w in $webroots) {
6573
foreach ($e in $executes) {
6674
Write-Host "Testing webroot=$w execute=$e"
67-
$result = ant -buildfile build.xml -Dwebroot=$w -Dexecute="$e" -DuniqueWorkingDir=true 2>&1
75+
$result = ant -buildfile build.xml -Dwebroot="$w" -Dexecute="$e" -DuniqueWorkingDir=true -DluceeVersionQuery=$env:LUCEE_VERSION_QUERY 2>&1
6876
if ($LASTEXITCODE -ne 0) {
69-
$cmd = "ant -buildfile build.xml -Dwebroot=$w -Dexecute='$e' -DuniqueWorkingDir=true"
77+
$cmd = "ant -buildfile build.xml -Dwebroot=\"$w\" -Dexecute=\"$e\" -DuniqueWorkingDir=true -DluceeVersionQuery=$env:LUCEE_VERSION_QUERY"
7078
$platform = "windows-latest"
7179
$shell = "pwsh"
7280
$summary = @()
@@ -88,15 +96,17 @@ jobs:
8896
java-version: '21'
8997
- name: Run all webroot/execute combinations
9098
shell: bash
99+
env:
100+
LUCEE_VERSION_QUERY: 7/all/zero
91101
run: |
92102
webroots=( '.' './webroot' 'webroot' "${{ github.workspace }}/webroot" '"./webroot"' '"${{ github.workspace }}/webroot"' )
93103
executes=( 'index.cfm' 'test.cfm' 'sub/test.cfm' )
94104
for w in "${webroots[@]}"; do
95105
for e in "${executes[@]}"; do
96106
echo "Testing webroot=$w execute=$e"
97-
result=$(ant -buildfile build.xml -Dwebroot=$w -Dexecute="$e" -DpreCleanup=false -DpostCleanup=false 2>&1)
107+
result=$(ant -buildfile build.xml -Dwebroot=$w -Dexecute="$e" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=$LUCEE_VERSION_QUERY 2>&1)
98108
if [ $? -ne 0 ]; then
99-
cmd="ant -buildfile build.xml -Dwebroot=$w -Dexecute=\"$e\" -DpreCleanup=false -DpostCleanup=false"
109+
cmd="ant -buildfile build.xml -Dwebroot=$w -Dexecute=\"$e\" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=$LUCEE_VERSION_QUERY"
100110
platform="macos-latest"
101111
shell="bash"
102112
echo -e "## Platform: $platform | Shell: $shell\n### $cmd\n\`\`\`\nFAILED: $w / $e\n$result\n\`\`\`\n" >> "$GITHUB_STEP_SUMMARY"
@@ -143,15 +153,17 @@ jobs:
143153
java-version: '21'
144154
- name: Run all webroot/execute combinations
145155
shell: cmd
156+
env:
157+
LUCEE_VERSION_QUERY: 7/all/zero
146158
run: |
147159
set webroots=.,./webroot,webroot,"${{ github.workspace }}\webroot","./webroot","${{ github.workspace }}\\webroot"
148160
set executes=index.cfm,test.cfm,sub/test.cfm
149161
for %%w in (%webroots%) do (
150162
for %%e in (%executes%) do (
151163
echo Testing webroot=%%w execute=%%e
152-
ant -buildfile build.xml -Dwebroot=%%w -Dexecute=%%e -DpreCleanup=false -DpostCleanup=false > result.txt 2>&1
164+
ant -buildfile build.xml -Dwebroot=%%w -Dexecute=%%e -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=%LUCEE_VERSION_QUERY% > result.txt 2>&1
153165
if errorlevel 1 (
154-
set cmd=ant -buildfile build.xml -Dwebroot=%%w -Dexecute="%%e" -DpreCleanup=false -DpostCleanup=false
166+
set cmd=ant -buildfile build.xml -Dwebroot=%%w -Dexecute="%%e" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=%LUCEE_VERSION_QUERY%
155167
echo ## Platform: windows-latest ^| Shell: cmd>> %GITHUB_STEP_SUMMARY%
156168
echo ### %cmd%>> %GITHUB_STEP_SUMMARY%
157169
echo "```" >> %GITHUB_STEP_SUMMARY%
@@ -176,15 +188,17 @@ jobs:
176188
java-version: '21'
177189
- name: Run all webroot/execute combinations
178190
shell: pwsh
191+
env:
192+
LUCEE_VERSION_QUERY: 7/all/zero
179193
run: |
180194
$webroots = @('.', './webroot', 'webroot', "${{ github.workspace }}\webroot", '"./webroot"', '"${{ github.workspace }}\\webroot"')
181195
$executes = @('index.cfm', 'test.cfm', 'sub/test.cfm')
182196
foreach ($w in $webroots) {
183197
foreach ($e in $executes) {
184198
Write-Host "Testing webroot=$w execute=$e"
185-
$result = ant -buildfile build.xml -Dwebroot=$w -Dexecute="$e" -DpreCleanup=false -DpostCleanup=false 2>&1
199+
$result = ant -buildfile build.xml -Dwebroot="$w" -Dexecute="$e" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=$env:LUCEE_VERSION_QUERY 2>&1
186200
if ($LASTEXITCODE -ne 0) {
187-
$cmd = "ant -buildfile build.xml -Dwebroot=$w -Dexecute='$e' -DpreCleanup=false -DpostCleanup=false"
201+
$cmd = "ant -buildfile build.xml -Dwebroot=\"$w\" -Dexecute=\"$e\" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=$env:LUCEE_VERSION_QUERY"
188202
$platform = "windows-latest"
189203
$shell = "pwsh"
190204
$summary = @()
@@ -212,15 +226,17 @@ jobs:
212226
java-version: '21'
213227
- name: Run all webroot/execute combinations
214228
shell: bash
229+
env:
230+
LUCEE_VERSION_QUERY: 7/all/zero
215231
run: |
216232
webroots=( '.' './webroot' 'webroot' "${{ github.workspace }}/webroot" '"./webroot"' '"${{ github.workspace }}/webroot"' )
217233
executes=( 'index.cfm' 'test.cfm' 'sub/test.cfm' )
218234
for w in "${webroots[@]}"; do
219235
for e in "${executes[@]}"; do
220236
echo "Testing webroot=$w execute=$e"
221-
result=$(ant -buildfile build.xml -Dwebroot=$w -Dexecute="$e" -DpreCleanup=false -DpostCleanup=false 2>&1)
237+
result=$(ant -buildfile build.xml -Dwebroot=$w -Dexecute="$e" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=$LUCEE_VERSION_QUERY 2>&1)
222238
if [ $? -ne 0 ]; then
223-
cmd="ant -buildfile build.xml -Dwebroot=$w -Dexecute=\"$e\" -DpreCleanup=false -DpostCleanup=false"
239+
cmd="ant -buildfile build.xml -Dwebroot=$w -Dexecute=\"$e\" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=$LUCEE_VERSION_QUERY"
224240
platform="windows-latest"
225241
shell="bash"
226242
echo -e "## Platform: $platform | Shell: $shell\n### $cmd\n\`\`\`\nFAILED: $w / $e\n$result\n\`\`\`\n" >> "$GITHUB_STEP_SUMMARY"

0 commit comments

Comments
 (0)