Revert "ci(github): edit multiple executions on the allure report"

This reverts commit a5e15cd.

Author: JonathanTSilva

.github/workflows/ci.yml

@@ -6,16 +6,19 @@ on:
   pull_request:
     branches: [ main ]
 
+# Best Practice: Prevent race conditions on the gh-pages branch
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  group: "pages"
   cancel-in-progress: true
 
+# These permissions are required for the actions to post comments and push to the gh-pages branch
 permissions:
-  contents: write
-  pull-requests: write
+  contents: read
+  pages: write
+  id-token: write
 
 jobs:
-  build-and-report:
+  build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -32,52 +35,61 @@ jobs:
       - name: Install dependencies
         run: poetry install --no-interaction --no-ansi
 
+      - name: Install Allure Commandline
+        run: |
+          wget https://github.com/allure-framework/allure2/releases/download/2.29.0/allure-2.29.0.tgz
+          sudo tar -zxvf allure-2.29.0.tgz -C /opt/
+          sudo ln -s /opt/allure-2.29.0/bin/allure /usr/bin/allure
+          allure --version
+
       - name: Run CI Pipeline (Lint, Typecheck, Test)
+        # This runs all checks and generates the raw 'allure-results'
         run: poetry run task ci
 
-      # FIX: Add this step to check out the existing gh-pages branch for history
-      - name: Check out gh-pages branch
+      - name: Check out gh-pages branch for history
         uses: actions/checkout@v4
         if: always()
-        continue-on-error: true # This allows the workflow to continue if the branch doesn't exist yet
+        continue-on-error: true
         with:
           ref: gh-pages
+          # Checkout to a specific path
           path: gh-pages
 
-      - name: Generate Allure Report with History
-        uses: mgrybyk-org/allure-report-branch-js-action@v1
-        if: always()
-        id: allure_report
-        with:
-          report_dir: 'test/allure-results'
-          gh_pages: 'gh-pages' # This MUST match the 'path' in the step above
-          max_reports: 50
+      - name: Copy history from previous report
+        run: |
+          # This command enables the history trend graph in the new report
+          cp -r gh-pages/history test/allure-results/ || echo "No history found on first run."
 
-      - name: Move report to root of gh-pages
-        if: always()
+      - name: Create CI report metadata
         run: |
-          # The report is in a nested folder; find it (its name is dynamic)
-          LATEST_REPORT_DIR=$(find gh-pages/allure-action -type d -name "*_*" | head -n 1)
-          # Move all of its contents to the root of the gh-pages checkout
-          mv $LATEST_REPORT_DIR/* gh-pages/
-
-      - name: Deploy Report to GH Pages
-        # This step only runs on pushes to the 'main' branch
-        if: always() && github.ref == 'refs/heads/main'
-        uses: mgrybyk-org/git-commit-pull-push-action@v1
-        with:
-          repository: gh-pages # The directory with the checked-out branch
-          branch: gh-pages      # The branch to push to
-          # This handles potential merge conflicts by favoring the new report
-          pull_args: --rebase -X ours
-
-      - name: Comment on Pull Request with Report Link
-        if: github.event_name == 'pull_request'
-        uses: thollander/actions-comment-pull-request@v2
+          # This creates the executor.json for clickable history links
+          echo '{"name": "GitHub Actions", "type": "github", "buildName": "Run #${{ github.run_number }}", "buildUrl": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}", "reportUrl": "https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/"}' > ./test/allure-results/executor.json
+
+      - name: Build Allure Report
+        # This calls your new 'report_ci' task
+        run: poetry run task report_ci
+
+      - name: Set up Pages
+        # This action prepares the artifact for deployment
+        uses: actions/configure-pages@v5
+
+      - name: Upload artifact
+        # This action uploads the report as a Pages artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          message: |
-            ${{ steps.allure_report.outputs.test_result_icon }} **Allure Test Report** is ready!
+          path: './test/allure-report'
 
-            * **Report Link:** ${{ steps.allure_report.outputs.report_url }}
-            * **History:** ${{ steps.allure_report.outputs.report_history_url }}
-          comment_tag: allure_report
+  # This job deploys the report
+  deploy:
+    # It requires the 'build' job to finish successfully
+    needs: build
+    # Only run this job on pushes to the main branch
+    if: github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

pyproject.toml

@@ -134,14 +134,8 @@ pre_test = "task lint && task typecheck"
 test = "rm -rf test/allure-results && pytest -s -x --cov=scriptize -vv --alluredir=test/allure-results"
 test_ci = "rm -rf test/allure-results && pytest -s --cov=scriptize -vv --alluredir=test/allure-results"
 # REPORTS
-post_test = """
-coverage html && \
-cp -r test/allure-report/history test/allure-results/ 2>/dev/null || true && \
-python test/generate_executor.py && \
-allure -q generate test/allure-results --clean -o test/allure-report && \
-echo 'Wrote Allure report to test/allure-report/index.html'
-"""
-report_ci = "allure -q generate test/allure-results --clean -o test/allure-report"
+post_test = "coverage html && cp -r test/allure-report/history test/allure-results/ 2>/dev/null || true && python -c \"import json, time; data={'name': 'Local Build', 'buildName': f'Run @ {time.strftime(\\\"%Y-%m-%d %H:%M:%S\\\")}'}; f=open('test/allure-results/executor.json', 'w'); json.dump(data, f);\" && allure -q generate test/allure-results --clean -o test/allure-report && echo 'Wrote Allure report to test/allure-reports/index.html'"
+report_ci = "allure generate test/allure-results --clean -o test/allure-report"
 cov_missing = "coverage report -m"
 docs = "mkdocs serve"
 # CI PIPELINE