fix required java version (fixes #2019, via #2022)

allure-framework · Jun 14, 2023 · 05d161f · 05d161f
1 parent d93681d
commit 05d161f
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 6 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -16,15 +16,54 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ '17.0.x' ]
+        java-version: [ '17' ]
     steps:
       - uses: actions/checkout@v3.5.3
-
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
+          cache: 'gradle'
       - name: Build with Gradle
         run: ./gradlew build buildDeb buildRpm
-
+      - name: Upload allure-commandline artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: allure-commandline
+          path: allure-commandline/build/install/allure-commandline
+      - name: Upload allure-results artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: allure-results
+          path: allure-generator/test-data/demo2
+  testcmd:
+    name: "Test Allure Commandline"
+    runs-on: ubuntu-latest
+    needs: build
+    strategy:
+      fail-fast: false
+      matrix:
+        java-version: [ '8', '11', '17', '20' ]
+    steps:
+      - name: Set up JRE ${{ matrix.java-version }}
+        uses: actions/setup-java@v3
+        with:
+          java-package: 'jre'
+          distribution: 'zulu'
+          java-version: ${{ matrix.java-version }}
+      - name: Download allure-commandline artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: allure-commandline
+      - name: Download allure-results artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: allure-results
+          path: allure-results
+      - name: Add execute permissions to script
+        run: chmod +x ./bin/allure
+      - name: Run version command
+        run: ./bin/allure --version
+      - name: Generate demo report
+        run: ./bin/allure generate allure-results
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17.0.x
+          java-version: 17
 
       - name: "Set up GPG"
         run: echo -n "${GPG_PRIVATE_KEY}" | base64 --decode > ${GITHUB_WORKSPACE}/${GPG_KEY_ID}.gpg

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -73,7 +73,7 @@ subprojects {
             mavenBom("io.qameta.allure:allure-bom:2.22.1")
         }
         dependencies {
-            dependency("ch.qos.logback:logback-classic:1.4.7")
+            dependency("ch.qos.logback:logback-classic:1.3.8")
             dependency("com.beust:jcommander:1.82")
             dependency("com.github.spotbugs:spotbugs-annotations:4.7.3")
             dependency("com.opencsv:opencsv:4.6")
@@ -99,7 +99,7 @@ subprojects {
                 entry("converter-jackson")
                 entry("retrofit")
             }
-            dependencySet("com.vladsch.flexmark:0.64.8") {
+            dependencySet("com.vladsch.flexmark:0.62.2") {
                 entry("flexmark")
                 entry("flexmark-ext-tables")
             }