From 247e9d98bfbac2629ddd035255ff97380b89f4a1 Mon Sep 17 00:00:00 2001
From: Wietse Wind <mail@wietse.com>
Date: Fri, 24 May 2024 02:10:40 +0200
Subject: [PATCH 1/2] CI on `jshooks` branch (#317)

---
 .github/workflows/build-in-docker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-in-docker.yml b/.github/workflows/build-in-docker.yml
index 26df3bd13..dd91a12f0 100644
--- a/.github/workflows/build-in-docker.yml
+++ b/.github/workflows/build-in-docker.yml
@@ -2,9 +2,9 @@ name: Build using Docker
 
 on:
   push:
-    branches: [ "dev", "candidate", "release" ]
+    branches: [ "dev", "candidate", "release", "jshooks" ]
   pull_request:
-    branches: [ "dev", "candidate", "release" ]
+    branches: [ "dev", "candidate", "release", "jshooks" ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

From 849a4435e0db184f7e6f5185e33661770a3da9f2 Mon Sep 17 00:00:00 2001
From: Wietse Wind <mail@wietse.com>
Date: Wed, 29 May 2024 13:45:59 +0200
Subject: [PATCH 2/2] CI Split jobs with prev job dependency & CI on `jshooks`
 (#320)

* CI on `jshooks` branch

* CI Split jobs with prev job dependency

* No multi branch worker in parallel

---------

Co-authored-by: Denis Angell <dangell@transia.co>
---
 .github/workflows/build-in-docker.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-in-docker.yml b/.github/workflows/build-in-docker.yml
index dd91a12f0..9a9018489 100644
--- a/.github/workflows/build-in-docker.yml
+++ b/.github/workflows/build-in-docker.yml
@@ -7,20 +7,32 @@ on:
     branches: [ "dev", "candidate", "release", "jshooks" ]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
 
 jobs:
-  builder:
+  checkout:
     runs-on: [self-hosted, vanity]
     steps:
     - uses: actions/checkout@v3
       with:
         clean: false
+  checkpatterns:
+    runs-on: [self-hosted, vanity]
+    needs: checkout
+    steps:
     - name: Check for suspicious patterns
       run: /bin/bash suspicious_patterns.sh
+  build:
+    runs-on: [self-hosted, vanity]
+    needs: checkpatterns
+    steps:
     - name: Build using Docker
       run: /bin/bash release-builder.sh
+  tests:
+    runs-on: [self-hosted, vanity]
+    needs: build
+    steps:
     - name: Unit tests
       run: /bin/bash docker-unit-tests.sh