Skip to content

Commit ce1ceb1

Browse files
committed
workflow updates: test-summary, bump matrix to JDK 19, version updates.
- use the geckodriver of the test runner - enable xserver for headful integration testing - strip repo credentials after checkout just to be sure
1 parent 0ce5787 commit ce1ceb1

2 files changed

Lines changed: 30 additions & 25 deletions

File tree

.github/workflows/codeql-analysis.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,20 @@ jobs:
3030

3131
steps:
3232
- name: Set up JDK 17
33-
uses: actions/setup-java@v2
33+
uses: actions/setup-java@v3
3434
with:
3535
java-version: 17
3636
distribution: 'zulu'
3737

3838
- name: Checkout Project
39-
uses: actions/checkout@v2
39+
uses: actions/checkout@v3
40+
with:
41+
persist-credentials: false
42+
submodules: false
4043

4144
# Initializes the CodeQL tools for scanning.
4245
- name: Initialize CodeQL
43-
uses: github/codeql-action/init@v1
46+
uses: github/codeql-action/init@v2
4447
with:
4548
languages: ${{ matrix.language }}
4649
config-file: ./.github/codeql/codeql-config.yml
@@ -49,4 +52,4 @@ jobs:
4952
run: mvn -DskipTests=true -V -ntp install
5053

5154
- name: Perform CodeQL Analysis
52-
uses: github/codeql-action/analyze@v1
55+
uses: github/codeql-action/analyze@v2

.github/workflows/main.yml

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717

1818
name: Apache Roller
1919

20-
# junit report action
21-
# https://github.com/marketplace/actions/junit-report-action
22-
2320
on:
2421
push:
2522
branches: [master]
@@ -30,45 +27,50 @@ jobs:
3027
build-test:
3128
name: Build+Test on Linux/JDK ${{ matrix.java }}
3229
runs-on: ubuntu-latest
30+
timeout-minutes: 30
3331

3432
strategy:
3533
fail-fast: false
3634
matrix:
37-
java: [ '11', '17', '18' ]
35+
java: [ '11', '17', '19' ]
3836

3937
steps:
4038
- name: Set up JDK ${{ matrix.java }}
41-
uses: actions/setup-java@v2
39+
uses: actions/setup-java@v3
4240
with:
4341
java-version: ${{ matrix.java }}
4442
distribution: 'zulu'
4543

44+
- name: Setup Xvfb
45+
run: |
46+
echo "DISPLAY=:99.0" >> $GITHUB_ENV
47+
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
48+
4649
- name: Checkout Project
4750
uses: actions/checkout@v3
51+
with:
52+
persist-credentials: false
53+
submodules: false
4854

4955
- name: Build Roller and run JUnit Tests
5056
run: mvn -V -ntp install
5157

5258
- name: Run Integration Tests
5359
run: |
5460
cd it-selenium
55-
bash -c "wget -c https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux64.tar.gz -O - | tar -xz"
56-
mvn -V -ntp install
61+
mvn -V -ntp -Dwebdriver.gecko.driver=$GECKOWEBDRIVER/geckodriver install
5762
58-
# TODO: needs submodule workaround since apache does not allow third party actions anymore
59-
# - name: Publish JUnit Report
60-
# uses: mikepenz/action-junit-report@v3
61-
# if: always()
62-
# with:
63-
# check_name: JUnit Reports for Linux/JDK ${{ matrix.java }}
64-
# report_paths: 'app/target/surefire-reports/TEST-*.xml'
65-
#
66-
# - name: Publish IT Report
67-
# uses: mikepenz/action-junit-report@v3
68-
# if: always()
69-
# with:
70-
# check_name: IT Reports for Linux/JDK ${{ matrix.java }}
71-
# report_paths: 'it-selenium/target/failsafe-reports/TEST-*.xml'
63+
- name: Publish JUnit Report
64+
uses: test-summary/action@v1
65+
if: always()
66+
with:
67+
paths: "app/target/surefire-reports/TEST-*.xml"
68+
69+
- name: Publish IT Report
70+
uses: test-summary/action@v1
71+
if: always()
72+
with:
73+
paths: "it-selenium/target/failsafe-reports/TEST-*.xml"
7274

7375
# only on integration and only once in this matrix
7476
- name: Upload Dev Build on Integration

0 commit comments

Comments
 (0)