Fix script and add verbose output

Author: falbrechtskirchinger

.github/workflows/test-beta.yml

@@ -18,7 +18,7 @@ jobs:
 
       - name: Collect test results
         id: test-results
-        run: python scripts/test_ebuilds.py --collect-test-results --from-event
+        run: python scripts/test_ebuilds.py -v --collect-test-results --from-event
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/test-ebuilds.yml

@@ -52,7 +52,7 @@ jobs:
       - name: Build test matrix
         id: build-matrix
         run: |
-          args=(--build-test-matrix)
+          args=(-v --build-test-matrix)
           if [[ "${{ github.event_name == 'workflow_run' }}" == "true" ]]; then
             args+=(--new-ebuilds ${{ github.event.workflow_run.head_sha }} ${{ steps.resolve-refs.outputs.commit_hash }})
           else
@@ -94,7 +94,7 @@ jobs:
 
       - name: Collect test results
         id: collect-test-results
-        run: python scripts/test_ebuilds.py --collect-test-results
+        run: python scripts/test_ebuilds.py -v --collect-test-results
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -122,7 +122,7 @@ jobs:
 
       - name: Prune ebuilds
         run: |
-          python scripts/update_ebuilds.py --prune --prune-checked --commit --step-summary
+          python scripts/update_ebuilds.py -v --prune --prune-checked --commit --step-summary
           git push
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test-nightly.yml

@@ -18,7 +18,7 @@ jobs:
 
       - name: Collect test results
         id: test-results
-        run: python scripts/test_ebuilds.py --collect-test-results --from-event
+        run: python scripts/test_ebuilds.py -v --collect-test-results --from-event
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/test-stable.yml

@@ -18,7 +18,7 @@ jobs:
 
       - name: Collect test results
         id: test-results
-        run: python scripts/test_ebuilds.py --collect-test-results --from-event
+        run: python scripts/test_ebuilds.py -v --collect-test-results --from-event
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/update-ebuilds.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Update ebuilds
         id: update-ebuilds
         run: |
-          python scripts/update_ebuilds.py --update --commit --step-summary
+          python scripts/update_ebuilds.py -v --update --commit --step-summary
           git push
 
       - name: Store HEAD commit hash

scripts/test_ebuilds.py

@@ -63,9 +63,8 @@ def build_test_matrix(mode, commits=None):
             key=lambda ebuild: [os.path.dirname(ebuild)] + version_key(ebuild)
         )
         name_to_channel = {
-            f"www-client/{name}/": channel
+            f"www-client/{make_name_from_channel(channel)[0]}/": channel
             for channel in CHANNELS
-            for name, _ in make_name_from_channel(channel)
         }
 
         for ebuild in new_ebuilds:
@@ -80,7 +79,7 @@ def build_test_matrix(mode, commits=None):
     else:
         raise ValueError(f"Invalid mode '{mode}'.")
 
-    set_output("test_matrix", json.dumps(matrix))
+    return matrix
 
 
 def main():
@@ -115,17 +114,28 @@ def main():
         action="store_true",
         help="Obtain run ID from workflow_run event.",
     )
+    parser.add_argument(
+        "--verbose", "-v",
+        action="store_true",
+        help="Enable verbose output.",
+    )
     args = parser.parse_args()
 
     require_gha()
 
     if args.build_test_matrix:
         mode = "new-ebuilds" if args.new_ebuilds else "latest-ebuilds"
-        build_test_matrix(mode, commits=args.new_ebuilds or None)
+        test_matrix = build_test_matrix(mode, commits=args.new_ebuilds or None)
+        set_output("test_matrix", json.dumps(test_matrix))
+        if args.verbose:
+            print(json.dumps(test_matrix, indent=2))
+
 
     if args.collect_test_results:
         test_results = collect_test_results(from_event=args.from_event)
         set_output("test_results", json.dumps(test_results))
+        if args.verbose:
+            print(json.dumps(test_results, indent=2))
 
 
 if __name__ == "__main__":

scripts/update_ebuilds.py

@@ -6,6 +6,7 @@
 import argparse
 import glob
 import hashlib
+import json
 import os
 import shutil
 import subprocess
@@ -278,6 +279,12 @@ def main():
         action="store_true",
         help="Write a GitHub step summary.",
     )
+    parser.add_argument(
+        "--verbose",
+        "-v",
+        action="store_true",
+        help="Enable verbose output.",
+    )
     args = parser.parse_args()
 
     new_ebuilds = None
@@ -286,13 +293,17 @@ def main():
 
     if args.update:
         new_ebuilds = update_ebuilds(repo_dir=repo_dir, commit_changes=args.commit)
+        if args.verbose:
+            print(json.dumps(new_ebuilds, indent=2))
 
     if args.prune:
         pruned_ebuilds = prune_ebuilds(
             repo_dir=repo_dir,
             commit_changes=True,
             successful_channels_only=args.prune_checked,
         )
+        if args.verbose:
+            print(json.dumps(pruned_ebuilds, indent=2))
 
     if args.step_summary:
         write_step_summary(new_ebuilds, pruned_ebuilds)