From 63c16e470daf6ee4fd2123295bd05ae0a15c7c0c Mon Sep 17 00:00:00 2001
From: Bocki <henning@bocklage.com>
Date: Wed, 16 Oct 2024 15:36:57 +0200
Subject: [PATCH] [prtester] Rework test storage (#4292)

* Update prtester.py

* Update prhtmlgenerator.yml
---
 .github/prtester.py                   | 14 ++++----
 .github/workflows/prhtmlgenerator.yml | 50 ++++++++++++++++++++++++---
 2 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/.github/prtester.py b/.github/prtester.py
index 3d7dae99..53d77725 100644
--- a/.github/prtester.py
+++ b/.github/prtester.py
@@ -4,7 +4,7 @@ import re
 from bs4 import BeautifulSoup
 from datetime import datetime
 from typing import Iterable
-import os.path
+import os
 import urllib
 
 # This script is specifically written to be used in automation for https://github.com/RSS-Bridge/rss-bridge
@@ -39,6 +39,8 @@ def main(instances: Iterable[Instance], with_upload: bool, with_reduced_upload:
 
 def testBridges(instance: Instance, bridge_cards: Iterable, with_upload: bool, with_reduced_upload: bool) -> Iterable:
     instance_suffix = ''
+    prid = os.getenv("PR")
+    tester_url = f'https://rss-bridge.github.io/rss-bridge-tests/prs/{prid}'
     if instance.name:
         instance_suffix = f' ({instance.name})'
     table_rows = []
@@ -140,10 +142,10 @@ def testBridges(instance: Instance, bridge_cards: Iterable, with_upload: bool, w
                 if status_is_ok:
                     status = '✔️'
                 if with_upload and (not with_reduced_upload or not status_is_ok):
-                    termpad = requests.post(url="https://termpad.com/", data=page_text)
-                    termpad_url = termpad.text.strip()
-                    termpad_url = termpad_url.replace('termpad.com/','termpad.com/raw/')
-            table_rows.append(f'| {bridge_name} | [{form_number} {context_name}{instance_suffix}]({termpad_url}) | {status} |')
+                    filename = f'{os.getcwd()}/{instance.name}_{form_number}.html'
+                    with open(file=filename, mode='wb') as file:
+                        file.write(page_text)
+            table_rows.append(f'| {bridge_name} | [{form_number} {context_name}{instance_suffix}]({tester_url}/{instance.name}_{form_number}.html) | {status} |')
             form_number += 1
     return table_rows
 
@@ -187,4 +189,4 @@ if __name__ == '__main__':
         with_reduced_upload=args.reduced_upload and not args.no_upload,
         title=args.title,
         output_file=args.output_file
-    );
\ No newline at end of file
+    );
diff --git a/.github/workflows/prhtmlgenerator.yml b/.github/workflows/prhtmlgenerator.yml
index 7985250a..90343973 100644
--- a/.github/workflows/prhtmlgenerator.yml
+++ b/.github/workflows/prhtmlgenerator.yml
@@ -13,7 +13,7 @@ jobs:
     # Needs additional permissions https://github.com/actions/first-interaction/issues/10#issuecomment-1041402989
     steps:
       - name: Check out self
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
@@ -33,7 +33,7 @@ jobs:
           docker build -t prbuild .;
           docker run -d -v $GITHUB_WORKSPACE/whitelist.txt:/app/whitelist.txt -v $GITHUB_WORKSPACE/DEBUG:/app/DEBUG -p 3001:80 prbuild
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.7'
           cache: 'pip'
@@ -51,9 +51,17 @@ jobs:
           body="${body//$'\n'/'%0A'}";
           body="${body//$'\r'/'%0D'}";
           echo "bodylength=${#body}" >> $GITHUB_OUTPUT
+        env:
+          PR: ${{ github.event.number }}
+      - name: Upload generated tests
+        uses: actions/upload-artifact@v4
+        id: upload-generated-tests
+        with:
+          name: tests
+          path: '*.html'
       - name: Find Comment
         if: ${{ steps.testrun.outputs.bodylength > 130 }}
-        uses: peter-evans/find-comment@v2
+        uses: peter-evans/find-comment@v3
         id: fc
         with:
           issue-number: ${{ github.event.pull_request.number }}
@@ -61,9 +69,43 @@ jobs:
           body-includes: Pull request artifacts
       - name: Create or update comment
         if: ${{ steps.testrun.outputs.bodylength > 130 }}
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@v4
         with:
           comment-id: ${{ steps.fc.outputs.comment-id }}
           issue-number: ${{ github.event.pull_request.number }}
           body-file: comment.txt
           edit-mode: replace
+  upload_tests:
+    name: Upload tests
+    runs-on: ubuntu-latest
+    needs: test-pr
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: 'RSS-Bridge/rss-bridge-tests'
+          ref: 'main'
+          token:  ${{ secrets.RSSTESTER_ACTION }}
+  
+      - name: Setup git config
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "<>"
+  
+      - name: Download tests
+        uses: actions/download-artifact@v4
+        with:
+          name: tests
+
+      - name: Move tests
+        run: |
+          cd prs
+          mkdir -p ${{github.event.number}}
+          cd ${{github.event.number}}
+          mv -f $GITHUB_WORKSPACE/*.html .
+          
+      - name: Commit and push generated tests
+        run: |
+          export COMMIT_MESSAGE="Added tests for PR ${{github.event.number}}"
+          git add .
+          git commit -m "$COMMIT_MESSAGE"
+          git push