From 1fbf774e043ff4c17111027994154d05ccfdc58f Mon Sep 17 00:00:00 2001
From: Christian Decker <decker.christian@gmail.com>
Date: Tue, 1 Nov 2022 14:43:46 +0100
Subject: [PATCH] gci: Split out the lnprototest from the larger CI run

The lnprototests are often blocking PRs, due to them failing, but we
can't restart them when valgrind runs are still ongoing, since they'd
also restart. Splitting allows us to rerun them selectively and waste
less time.

Ideally we'd just fix them, but I am by no means knowledgeable enough
to fix them now.
---
 .github/workflows/ci.yaml        | 39 ---------------------------
 .github/workflows/prototest.yaml | 45 ++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 39 deletions(-)
 create mode 100644 .github/workflows/prototest.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4b274e016..173bd32c6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -100,45 +100,6 @@ jobs:
           ./configure
           make check-doc
 
-  # proto-test:
-  #   name: Protocol Test Config
-  #   runs-on: ubuntu-22.04
-  #   timeout-minutes: 300
-  #   needs: [smoke-test]
-  #   strategy:
-  #     fail-fast: true
-  #     matrix:
-  #       include:
-  #         - {compiler: clang, db: sqlite3}
-  #         - {compiler: gcc, db: postgres}
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v2.0.0
-  #     - name: Build and run
-  #       run: |
-  #         docker build -f contrib/docker/Dockerfile.ubuntu -t cln-ci-ubuntu .
-  #         docker run -e ARCH=${{ matrix.arch }} \
-  #         -e COMPILER=${{ matrix.compiler }} \
-  #         -e DB=${{ matrix.db }} \
-  #         -e NETWORK=${{ matrix.network }} \
-  #         -e TARGET_HOST=${{ matrix.TARGET_HOST }} \
-  #         -e VALGRIND=${{ matrix.valgrind }} \
-  #         -e DEVELOPER=1 \
-  #         -e EXPERIMENTAL_FEATURES=1 \
-  #         -e COMPAT=0 \
-  #         -e PYTEST_PAR=2 \
-  #         -e PYTEST_OPTS="--timeout=300" \
-  #         -e TEST_CMD="make check-protos" \
-  #         -e TEST_GROUP=1 \
-  #         -e TEST_GROUP_COUNT=1 \
-  #         cln-ci-ubuntu
-  #     - name: Upload Unit Test Results
-  #       if: always()
-  #       uses: actions/upload-artifact@v2
-  #       with:
-  #         name: Junit Report ${{ github.run_number }}.{{ matrix.cfg }}
-  #         path: report.*
-
   normal-test:
     name: Normal Test Config ${{ matrix.cfg }}
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/prototest.yaml b/.github/workflows/prototest.yaml
new file mode 100644
index 000000000..dc2461d07
--- /dev/null
+++ b/.github/workflows/prototest.yaml
@@ -0,0 +1,45 @@
+---
+name: LN Proto Test
+on:
+  push:
+    branches:
+      - "master"
+  pull_request:
+jobs:
+  proto-test:
+    name: Protocol Test Config
+    runs-on: ubuntu-22.04
+    timeout-minutes: 300
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+          - {compiler: clang, db: sqlite3}
+          - {compiler: gcc, db: postgres}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Build and run
+        run: |
+          docker build -f contrib/docker/Dockerfile.ubuntu -t cln-ci-ubuntu .
+          docker run -e ARCH=${{ matrix.arch }} \
+          -e COMPILER=${{ matrix.compiler }} \
+          -e DB=${{ matrix.db }} \
+          -e NETWORK=${{ matrix.network }} \
+          -e TARGET_HOST=${{ matrix.TARGET_HOST }} \
+          -e VALGRIND=${{ matrix.valgrind }} \
+          -e DEVELOPER=1 \
+          -e EXPERIMENTAL_FEATURES=1 \
+          -e COMPAT=0 \
+          -e PYTEST_PAR=2 \
+          -e PYTEST_OPTS="--timeout=300" \
+          -e TEST_CMD="make check-protos" \
+          -e TEST_GROUP=1 \
+          -e TEST_GROUP_COUNT=1 \
+          cln-ci-ubuntu
+      - name: Upload Unit Test Results
+        if: always()
+        uses: actions/upload-artifact@v2.2.4
+        with:
+          name: Junit Report ${{ github.run_number }}.{{ matrix.cfg }}
+          path: report.*