Skip to content

Commit 25b546a

Browse files
committed
Update webroot-matrix.yml
1 parent c903915 commit 25b546a

1 file changed

Lines changed: 16 additions & 26 deletions

File tree

.github/workflows/webroot-matrix.yml

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,31 @@ on:
55
pull_request:
66
workflow_dispatch:
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
12+
813
jobs:
9-
ubuntu-bash:
10-
name: Ubuntu Bash
11-
runs-on: ubuntu-latest
14+
test:
15+
runs-on: ${{ matrix.os }}
1216
strategy:
1317
matrix:
14-
webroot:
15-
- '.'
16-
- "./webroot"
17-
- "webroot"
18-
- ${{ github.workspace }}/webroot
19-
- '"./webroot"'
20-
- '"${{ github.workspace }}/webroot"'
21-
execute:
22-
- "index.cfm"
23-
- "test.cfm"
24-
- "sub/test.cfm"
18+
os: [ubuntu-latest, windows-latest, macos-latest]
2519
steps:
2620
- uses: actions/checkout@v4
2721
- name: Set up Java
2822
uses: actions/setup-java@v4
2923
with:
3024
distribution: 'temurin'
31-
java-version: '21'
32-
- name: Run Ant webroot test
33-
shell: bash
34-
run: |
35-
ant -buildfile build.xml -Dwebroot=${{ matrix.webroot }} -Dexecute="${{ matrix.execute }}" -DuniqueWorkingDir=true
36-
working-directory: ${{ github.workspace }}
37-
- name: Check output
38-
shell: bash
39-
run: |
40-
grep 'webroot test:' logs/* || (echo 'webroot test output not found' && exit 1)
41-
working-directory: ${{ github.workspace }}
42-
25+
java-version: '17'
26+
- name: Run default test (index.cfm)
27+
run: ant -Dwebroot=webroot -Dexecute=index.cfm
28+
- name: Run subfolder test (sub/test.cfm)
29+
run: ant -Dwebroot=webroot -Dexecute=sub/test.cfm
30+
- name: Run test.cfm
31+
run: ant -Dwebroot=webroot -Dexecute=test.cfm
32+
# Add more steps for other argument combinations if needed
4333
ubuntu-pwsh:
4434
name: Ubuntu PowerShell
4535
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)