From 4b9a69507071ae08cac9a6d94ce459403c721706 Mon Sep 17 00:00:00 2001
From: x-mass <36629999+x-mass@users.noreply.github.com>
Date: Sun, 17 Mar 2024 19:07:17 +0000
Subject: [PATCH] Use crypto3 Nix testing workflow

---
 .github/workflows/publish-results.yml     | 13 -------
 .github/workflows/pull-request-action.yml | 43 -----------------------
 .github/workflows/pull-request.yml        | 39 ++++++++++++++++++--
 3 files changed, 36 insertions(+), 59 deletions(-)
 delete mode 100644 .github/workflows/publish-results.yml
 delete mode 100644 .github/workflows/pull-request-action.yml

diff --git a/.github/workflows/publish-results.yml b/.github/workflows/publish-results.yml
deleted file mode 100644
index fe59679b..00000000
--- a/.github/workflows/publish-results.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Needed to publish test results in fork
-name: Testing Callback
-
-on:
-  workflow_run:
-    workflows: ["PR Testing"]
-    types:
-      - completed
-
-jobs:
-  call-reusable-workflow:
-    name: Call Reusable Testing Callback Workflow
-    uses: NilFoundation/ci-cd/.github/workflows/reusable-crypto3-publish-result.yml@v1.2.0
diff --git a/.github/workflows/pull-request-action.yml b/.github/workflows/pull-request-action.yml
deleted file mode 100644
index 5b6551ff..00000000
--- a/.github/workflows/pull-request-action.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Reusable PR testing for mac and linux
-
-on:
-  workflow_call:
-    inputs:
-      targets:
-        type: string
-        description: "Make and CTest targets. If not specified, everything is tested"
-        required: false
-        default: ""
-
-jobs:
-  handle-syncwith:
-    name: Call Reusable SyncWith Handler
-    uses: NilFoundation/ci-cd/.github/workflows/reusable-handle-syncwith.yml@v1.2.0
-    with:
-      ci-cd-ref: 'v1.2.0'
-    secrets: inherit
-
-  matrix-test-linux:
-    name: Linux Reusable Crypto3 Testing
-    needs:
-      - handle-syncwith
-    uses: NilFoundation/ci-cd/.github/workflows/reusable-crypto3-testing-linux.yml@v1.2.0
-
-    secrets: inherit
-    with:
-      submodules-refs: ${{ needs.handle-syncwith.outputs.prs-refs }}
-      targets: ${{ inputs.targets }} 
-      concurrency: 1 # hash tests take too much RAM.
-
-# Temporarily disable mac tests, they fail.
-#  matrix-test-mac:
-#    name: Mac Reusable Crypto3 Testing
-#    needs:
-#      - handle-syncwith
-#    uses: NilFoundation/ci-cd/.github/workflows/reusable-crypto3-testing-mac.yml@v1.2.0
-#
-#    secrets: inherit
-#    with:
-#      submodules-refs: ${{ needs.handle-syncwith.outputs.prs-refs }}
-#      targets: ${{ inputs.targets }} 
-#      concurrency: 1 # hash tests take too much RAM.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 2cd40d13..ef80df7a 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -7,8 +7,41 @@ on:
       - synchronize
 
 jobs:
-  run-pull-request-actions:
-    name: Reusable Crypto3 Testing
-    uses: ./.github/workflows/pull-request-action.yml
+  handle-syncwith:
+    name: Call Reusable SyncWith Handler
+    uses: NilFoundation/ci-cd/.github/workflows/reusable-handle-syncwith.yml@v1.2.0
+    with:
+      ci-cd-ref: 'v1.2.0'
+    secrets: inherit
+
+  test-linux:
+    name: Linux Reusable Crypto3 Testing
+    needs:
+      - handle-syncwith
+    uses: NilFoundation/ci-cd/.github/workflows/reusable-crypto3-testing-linux.yml@crypto-nix
+
+    secrets: inherit
+    with:
+      submodules-refs: ${{ needs.handle-syncwith.outputs.prs-refs }}
+      check-names: |
+        hash-clang
+
+  # Temporarily disable mac tests, they fail.
+  test-mac:
+    name: Mac Reusable Crypto3 Testing
+    needs:
+      - handle-syncwith
+    uses: NilFoundation/ci-cd/.github/workflows/reusable-crypto3-testing-mac.yml@crypto-nix
 
     secrets: inherit
+    with:
+      submodules-refs: ${{ needs.handle-syncwith.outputs.prs-refs }}
+      check-names: |
+        hash-clang
+
+  publish-results:
+    name: Publish JUnit results
+    needs:
+      - test-linux
+      - test-mac
+    uses: NilFoundation/ci-cd/.github/workflows/reusable-crypto3-publish-result.yml@crypto-nix