Skip to content

Commit 43559ba

Browse files
authored
Prepare Allure Java 3.0.0 with Java 17 baseline and HTTP exchange attachments (via #1283)
1 parent 3d48356 commit 43559ba

375 files changed

Lines changed: 7186 additions & 16412 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,42 +25,37 @@ body:
2525
description: Please select the Allure integration you
2626
options:
2727
- allure-assertj
28-
- allure-attachments
2928
- allure-awaitility
29+
- allure-bom
3030
- allure-citrus
31-
- allure-cucumber2-jvm
32-
- allure-cucumber3-jvm
33-
- allure-cucumber4-jvm
34-
- allure-cucumber5-jvm
35-
- allure-cucumber6-jvm
3631
- allure-cucumber7-jvm
3732
- allure-descriptions-javadoc
3833
- allure-grpc
3934
- allure-hamcrest
4035
- allure-httpclient
36+
- allure-httpclient5
4137
- allure-java-commons
38+
- allure-java-commons-test
4239
- allure-jax-rs
43-
- allure-jbehave
4440
- allure-jbehave5
41+
- allure-jooq
4542
- allure-jsonunit
4643
- allure-junit-platform
4744
- allure-junit4
45+
- allure-junit4-aspect
4846
- allure-jupiter
4947
- allure-jupiter-assert
50-
- allure-junit5
51-
- allure-junit5-assert
5248
- allure-karate
53-
- allure-okhttp
49+
- allure-model
5450
- allure-okhttp3
55-
- allure-reader
51+
- allure-playwright
5652
- allure-rest-assured
5753
- allure-scalatest
54+
- allure-selenium-bidi
5855
- allure-selenide
5956
- allure-servlet-api
60-
- allure-spock
6157
- allure-spock2
6258
- allure-spring-web
63-
- allure-test-filter
6459
- allure-testng
6560
validations:
6661
required: true

.github/labeler.yml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,46 @@
1111
"theme:assertj":
1212
- "allure-assertj/**"
1313

14-
"theme:attachments":
15-
- "allure-attachments/**"
14+
"theme:awaitility":
15+
- "allure-awaitility/**"
16+
17+
"theme:bom":
18+
- "allure-bom/**"
1619

1720
"theme:citrus":
1821
- "allure-citrus/**"
1922

2023
"theme:cucumber-jvm":
21-
- "allure-cucumber*-jvm/**"
24+
- "allure-cucumber7-jvm/**"
2225

2326
"theme:descriptions-javadoc":
2427
- "allure-descriptions-javadoc/**"
2528

29+
"theme:grpc":
30+
- "allure-grpc/**"
31+
32+
"theme:hamcrest":
33+
- "allure-hamcrest/**"
34+
2635
"theme:httpclient":
2736
- "allure-httpclient/**"
37+
- "allure-httpclient5/**"
2838

2939
"theme:model":
3040
- "allure-model/**"
3141

3242
"theme:core":
3343
- "allure-java-commons/**"
3444
- "allure-java-commons-test/**"
35-
- "allure-test-filter/**"
3645

3746
"theme:jax-rs":
3847
- "allure-jax-rs/**"
3948

4049
"theme:jbehave":
41-
- "allure-jbehave*/**"
50+
- "allure-jbehave5/**"
51+
52+
"theme:jooq":
53+
- "allure-jooq/**"
4254

4355
"theme:jsonunit":
4456
- "allure-jsonunit/**"
@@ -56,29 +68,31 @@
5668
- "allure-karate/**"
5769

5870
"theme:okhttp":
59-
- "allure-okhttp/**"
6071
- "allure-okhttp3/**"
6172

73+
"theme:playwright":
74+
- "allure-playwright/**"
75+
6276
"theme:rest-assured":
6377
- "allure-rest-assured/**"
6478

6579
"theme:scalatest":
6680
- "allure-scalatest/**"
6781

82+
"theme:selenium-bidi":
83+
- "allure-selenium-bidi/**"
84+
6885
"theme:selenide":
6986
- "allure-selenide/**"
7087

7188
"theme:servlet-api":
7289
- "allure-servlet-api/**"
7390

7491
"theme:spock":
75-
- "allure-spock/**"
92+
- "allure-spock2/**"
7693

7794
"theme:spring":
7895
- "allure-spring-web/**"
7996

8097
"theme:testng":
8198
- "allure-testng/**"
82-
83-
"theme:hamcrest":
84-
- "allure-hamcrest/**"

.github/workflows/build.yml

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,15 @@ concurrency:
2121

2222
jobs:
2323
build:
24-
name: "Build"
24+
name: "Build (JDK ${{ matrix.java }})"
2525
runs-on: ubuntu-latest
26+
strategy:
27+
fail-fast: false
28+
matrix:
29+
java: [17, 25]
2630
env:
27-
ALLURE_MATRIX_ENV: ubuntu-jdk-21
28-
ALLURE_TEST_DUMP_NAME: allure-results-test-jdk-21
31+
ALLURE_MATRIX_ENV: ubuntu-jdk-${{ matrix.java }}
32+
ALLURE_TEST_DUMP_NAME: allure-results-test-jdk-${{ matrix.java }}
2933
steps:
3034
- uses: actions/checkout@v6
3135

@@ -37,19 +41,34 @@ jobs:
3741
uses: actions/setup-java@v5
3842
with:
3943
distribution: 'zulu'
40-
java-version: 21
44+
java-version: ${{ matrix.java }}
4145

4246
- name: "Setup Gradle"
4347
uses: gradle/actions/setup-gradle@v6
4448
with:
4549
gradle-version: 'wrapper'
4650

51+
- name: "Select Gradle task exclusions"
52+
shell: bash
53+
run: |
54+
if [[ "${{ matrix.java }}" == "17" ]]; then
55+
higher_java_modules=(
56+
":allure-jooq"
57+
":allure-karate"
58+
)
59+
excludes=()
60+
for module in "${higher_java_modules[@]}"; do
61+
excludes+=("-x" "$module:build" "-x" "$module:test")
62+
done
63+
echo "GRADLE_EXCLUDES=${excludes[*]}" >> "$GITHUB_ENV"
64+
fi
65+
4766
- name: "Build with Gradle"
48-
run: ./gradlew build -x test --scan
67+
run: ./gradlew build -x test $GRADLE_EXCLUDES --scan
4968

5069
- name: "Run tests with Allure"
5170
if: always()
52-
run: npx -y allure@3 run --config ./allurerc.mjs --rerun 2 --environment="${{ env.ALLURE_MATRIX_ENV }}" --dump="${{ env.ALLURE_TEST_DUMP_NAME }}" -- ./gradlew --no-build-cache cleanTest test
71+
run: npx -y allure@3 run --config ./allurerc.mjs --rerun 2 --environment="${{ env.ALLURE_MATRIX_ENV }}" --dump="${{ env.ALLURE_TEST_DUMP_NAME }}" -- ./gradlew --no-build-cache cleanTest test $GRADLE_EXCLUDES
5372

5473
- name: "Upload Allure test dump"
5574
if: always()

0 commit comments

Comments
 (0)