From d16e19a34262e6b688fc95cdd42600b970b53cb4 Mon Sep 17 00:00:00 2001
From: Amos Wenger <amos@bearcove.net>
Date: Mon, 6 Nov 2023 17:51:33 +0100
Subject: [PATCH] Move workflows/actions around

---
 .../{report-http2.yml => h2spec-report.yml}   | 21 ++++++++++++--
 .github/workflows/release-plz.yaml            | 10 +++----
 .github/workflows/report-generic.yml          | 29 -------------------
 .github/workflows/report-hpack.yml            | 29 -------------------
 .github/workflows/report-regressions.yml      | 26 -----------------
 5 files changed, 23 insertions(+), 92 deletions(-)
 rename .github/workflows/{report-http2.yml => h2spec-report.yml} (51%)
 delete mode 100644 .github/workflows/report-generic.yml
 delete mode 100644 .github/workflows/report-hpack.yml
 delete mode 100644 .github/workflows/report-regressions.yml

diff --git a/.github/workflows/report-http2.yml b/.github/workflows/h2spec-report.yml
similarity index 51%
rename from .github/workflows/report-http2.yml
rename to .github/workflows/h2spec-report.yml
index 6f1e0edb..257b9177 100644
--- a/.github/workflows/report-http2.yml
+++ b/.github/workflows/h2spec-report.yml
@@ -1,4 +1,4 @@
-name: report-http2
+name: h2spec-report
 
 on:
   workflow_run:
@@ -9,7 +9,7 @@ permissions:
   checks: write
 
 jobs:
-  checks:
+  h2spec-report:
     runs-on: ubuntu-latest
     steps:
       - name: Download h2spec Report
@@ -21,10 +21,25 @@ jobs:
       - name: Stub Git repo for test-reporter
         run: |
           git init
+      - name: Publish h2spec-generic report
+        uses: dorny/test-reporter@v1
+        with:
+          name: h2spec-generic
+          path: h2spec-generic.xml
+          reporter: java-junit
+      - name: Publish h2spec-hpack report
+        uses: dorny/test-reporter@v1
+        with:
+          name: h2spec-hpack
+          path: h2spec-hpack.xml
+          reporter: java-junit
       - name: Publish h2spec-http2 report
         uses: dorny/test-reporter@v1
         with:
           name: h2spec-http2
           path: h2spec-http2.xml
           reporter: java-junit
-          fail-on-error: 'false'
\ No newline at end of file
+      - name: Report h2spec regressions      
+        uses: hapsoc/report-h2spec-regressions@da0ad5d1fd6caf2b16b46fda70e5cb5638435baa
+        with:
+          suites: "h2spec-generic,h2spec-hpack,h2spec-http2"
\ No newline at end of file
diff --git a/.github/workflows/release-plz.yaml b/.github/workflows/release-plz.yaml
index 815e91c3..02e58489 100644
--- a/.github/workflows/release-plz.yaml
+++ b/.github/workflows/release-plz.yaml
@@ -1,14 +1,14 @@
-name: Release-plz
-
-permissions:
-  pull-requests: write
-  contents: write
+name: release-plz
 
 on:
   push:
     branches:
       - main
 
+permissions:
+  pull-requests: write
+  contents: write
+
 jobs:
   release-plz:
     name: Release-plz
diff --git a/.github/workflows/report-generic.yml b/.github/workflows/report-generic.yml
deleted file mode 100644
index 33d3cb2c..00000000
--- a/.github/workflows/report-generic.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: report-generic
-
-on:
-  workflow_run:
-    workflows: [test]
-    types: [completed]
-    
-permissions:
-  checks: write
-
-jobs:
-  checks:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download h2spec Report
-        uses: dawidd6/action-download-artifact@v2
-        with:
-          name: h2spec-results
-          workflow: ${{ github.event.workflow.id }}
-          run_id: ${{ github.event.workflow_run.id }}
-      - name: Stub Git repo for test-reporter
-        run: |
-          git init
-      - name: Publish h2spec-generic report
-        uses: dorny/test-reporter@v1
-        with:
-          name: h2spec-generic
-          path: h2spec-generic.xml
-          reporter: java-junit
\ No newline at end of file
diff --git a/.github/workflows/report-hpack.yml b/.github/workflows/report-hpack.yml
deleted file mode 100644
index 86167b30..00000000
--- a/.github/workflows/report-hpack.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: report-hpack
-
-on:
-  workflow_run:
-    workflows: [test]
-    types: [completed]
-    
-permissions:
-  checks: write
-
-jobs:
-  checks:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download h2spec Report
-        uses: dawidd6/action-download-artifact@v2
-        with:
-          name: h2spec-results
-          workflow: ${{ github.event.workflow.id }}
-          run_id: ${{ github.event.workflow_run.id }}
-      - name: Stub Git repo for test-reporter
-        run: |
-          git init
-      - name: Publish h2spec-hpack report
-        uses: dorny/test-reporter@v1
-        with:
-          name: h2spec-hpack
-          path: h2spec-hpack.xml
-          reporter: java-junit
\ No newline at end of file
diff --git a/.github/workflows/report-regressions.yml b/.github/workflows/report-regressions.yml
deleted file mode 100644
index 7aab69a8..00000000
--- a/.github/workflows/report-regressions.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: report-regressions
-
-on:
-  workflow_run:
-    workflows: [test]
-    types: [completed]
-    
-permissions:
-  checks: write
-  issues: write
-
-jobs:
-  checks:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download h2spec Report
-        uses: dawidd6/action-download-artifact@v2
-        with:
-          name: h2spec-results
-          workflow: ${{ github.event.workflow.id }}
-          run_id: ${{ github.event.workflow_run.id }}
-      - name: Report h2spec regressions      
-        uses: hapsoc/report-h2spec-regressions@da0ad5d1fd6caf2b16b46fda70e5cb5638435baa
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          suites: "h2spec-generic,h2spec-hpack,h2spec-http2"
\ No newline at end of file