From 559e814113795976879f001696851d1f44e960a8 Mon Sep 17 00:00:00 2001
From: AEkaterina <astapkina.caterina@gmail.cpm>
Date: Mon, 9 Oct 2023 13:27:29 +0400
Subject: [PATCH] updated allure generation

---
 .github/workflows/maven.yml | 51 ++++++++++++++++++++++++-------------
 pom.xml                     |  9 +++++++
 2 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 84067b0..b09ca5d 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -52,35 +52,50 @@ jobs:
 #          allure --version
 #        if: runner.os == 'Linux'
 
-      - name: Print PATH
-        run: echo $PATH
+#      - name: Print PATH
+#        run: echo $PATH
 
-      - name: Verify Allure installation
-        run: /opt/allure/bin/allure --version
+#      - name: Verify Allure installation
+#        run: /opt/allure/bin/allure --version
 
-      - name: Check Allure binary presence
-        run: ls -l /opt/allure/bin
+#      - name: Check Allure binary presence
+#        run: ls -l /opt/allure/bin
 
       - name: Run tests
         run: mvn clean test -Daquality.buildName="${{github.event.inputs.build_name}}" -DdriverSettings.${{github.event.inputs.platform_name}}.deviceKey=${{github.event.inputs.device_name_and_version}} -Daquality.suiteName="${{github.event.inputs.platform_name}} - ${{github.event.inputs.test_tag}}" -Daquality.environment="${{github.event.inputs.platform_name}}" -Dcredentials.LYRASISReads."ios".${{secrets.BookCardLyrasis1}}=${{secrets.BookPinLyrasis1}} -Dcredentials.LYRASISReads."ios".${{secrets.BookCardLyrasis2}}=${{secrets.BookPinLyrasis2}} -Dcredentials.LYRASISReads."ios".${{secrets.BookCardLyrasis3}}=${{secrets.BookPinLyrasis3}} -Dcredentials.LYRASISReads."ios".${{secrets.BookCardLyrasis4}}=${{secrets.BookPinLyrasis4}} -Dcredentials.LYRASISReads."android".${{secrets.BookCardLyrasis1}}=${{secrets.BookPinLyrasis1}} -Dcredentials.LYRASISReads."android".${{secrets.BookCardLyrasis2}}=${{secrets.BookPinLyrasis2}} -Dcredentials.LYRASISReads."android".${{secrets.BookCardLyrasis3}}=${{secrets.BookPinLyrasis3}} -Dcredentials.LYRASISReads."android".${{secrets.BookCardLyrasis4}}=${{secrets.BookPinLyrasis4}} -Dcredentials.A1QATestLibrary."ios".${{secrets.BookCardLyrasis1}}=${{secrets.BookPinLyrasis1}} -Dcredentials.A1QATestLibrary."ios".${{secrets.BookCardLyrasis2}}=${{secrets.BookPinLyrasis2}} -Dcredentials.A1QATestLibrary."ios".${{secrets.BookCardLyrasis3}}=${{secrets.BookPinLyrasis3}} -Dcredentials.A1QATestLibrary."ios".${{secrets.BookCardLyrasis4}}=${{secrets.BookPinLyrasis4}} -Dcredentials.A1QATestLibrary."android".${{secrets.BookCardLyrasis1}}=${{secrets.BookPinLyrasis1}} -Dcredentials.A1QATestLibrary."android".${{secrets.BookCardLyrasis2}}=${{secrets.BookPinLyrasis2}} -Dcredentials.A1QATestLibrary."android".${{secrets.BookCardLyrasis3}}=${{secrets.BookPinLyrasis3}} -Dcredentials.A1QATestLibrary."android".${{secrets.BookCardLyrasis4}}=${{secrets.BookPinLyrasis4}} -DremoteConnectionUrl=${{secrets.remoteConnectionUrl}} -DdriverSettings.${{github.event.inputs.platform_name}}.capabilities."browserstack.user"=${{secrets.BROWSERSTACK_USER}} -DdriverSettings.${{github.event.inputs.platform_name}}.capabilities."browserstack.key"=${{secrets.BROWSERSTACK_KEY}} -DplatformName=${{github.event.inputs.platform_name}} -DdriverSettings.${{github.event.inputs.platform_name}}.capabilities.app=${{github.event.inputs.bs_app_link}} -Dcucumber.options="--tags '(${{github.event.inputs.test_tag}} and not @ignore) and not @exclude_${{github.event.inputs.platform_name}}'"
         continue-on-error: true
 
-      - name: Ensure Allure results directory exists
-        run: mkdir -p allure-results
+      - name: Generate Allure Report
+        run: mvn allure:report
 
-      - name: Copy Allure results
-        run: cp -R target/allure-results allure-results/
-        if: success()
-
-      - name: Generate Allure report
-        run: /opt/allure/bin/allure generate allure-results --clean -o allure-report
-        working-directory: ${{ github.workspace }}
-
-      - name: Upload Allure report artifacts
+      - name: Upload Allure Report
         uses: actions/upload-artifact@v2
         with:
           name: allure-report
-          path: allure-report
+          path: target/site/allure-maven-plugin
+
+      - name: Archive and publish Allure Report
+        uses: actions/github-pages-deploy@v2
+        with:
+          token: ${{ secrets.PERSONAL_TOKEN }}
+          folder: target/site/allure-maven-plugin
+
+#      - name: Ensure Allure results directory exists
+#        run: mkdir -p allure-results
+
+#      - name: Copy Allure results
+#        run: cp -R target/allure-results allure-results/
+#        if: success()
+
+#      - name: Generate Allure report
+#        run: /opt/allure/bin/allure generate allure-results --clean -o allure-report
+#        working-directory: ${{ github.workspace }}
+
+#      - name: Upload Allure report artifacts
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: allure-report
+#          path: allure-report
 
 
 
diff --git a/pom.xml b/pom.xml
index 06fa4bc..100e083 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,10 +28,19 @@
                 </configuration>
             </plugin>
 
+<!--            <plugin>-->
+<!--                <groupId>io.qameta.allure</groupId>-->
+<!--                <artifactId>allure-maven</artifactId>-->
+<!--                <version>2.10.0</version>-->
+<!--            </plugin>-->
+
             <plugin>
                 <groupId>io.qameta.allure</groupId>
                 <artifactId>allure-maven</artifactId>
                 <version>2.10.0</version>
+                <configuration>
+                    <resultsDirectory>${project.build.directory}/allure-results</resultsDirectory>
+                </configuration>
             </plugin>
 
             <plugin>