From 479e09c2cf2854a0f0bd8708e2cbba4c8f999d49 Mon Sep 17 00:00:00 2001
From: Tom Wieczorek <twieczorek@mirantis.com>
Date: Fri, 3 Feb 2023 16:33:28 +0100
Subject: [PATCH] Let CI use parallel builds

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
---
 .github/workflows/build-airgap-image-bundle.yml | 3 +++
 .github/workflows/build-docs.yml                | 3 +++
 .github/workflows/build-k0s.yml                 | 3 +++
 .github/workflows/check-network.yaml            | 3 +++
 .github/workflows/go.yml                        | 3 +++
 .github/workflows/lint.yaml                     | 3 +++
 .github/workflows/ostests-e2e.yaml              | 1 +
 .github/workflows/publish-docs-manual.yml       | 1 +
 .github/workflows/publish-docs.yml              | 3 +++
 .github/workflows/release.yml                   | 1 +
 .github/workflows/sbom-upload.yml               | 3 +++
 vars.sh                                         | 3 +++
 12 files changed, 30 insertions(+)

diff --git a/.github/workflows/build-airgap-image-bundle.yml b/.github/workflows/build-airgap-image-bundle.yml
index e01c8c64c245..1350b26da08a 100644
--- a/.github/workflows/build-airgap-image-bundle.yml
+++ b/.github/workflows/build-airgap-image-bundle.yml
@@ -15,6 +15,9 @@ on:
         description: The airgap image bundle's cache key.
         value: ${{ jobs.build.outputs.cache-key }}
 
+env:
+  MAKEFLAGS: -j
+
 jobs:
   build:
     name: "${{ inputs.target-os }}-${{ inputs.target-arch }}"
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
index 6ff1ea518bdf..330977ccbb3d 100644
--- a/.github/workflows/build-docs.yml
+++ b/.github/workflows/build-docs.yml
@@ -11,6 +11,9 @@ on:
       - CODE_OF_CONDUCT.md
       - docs/**
 
+env:
+  MAKEFLAGS: -j
+
 jobs:
   build:
     name: Build docs
diff --git a/.github/workflows/build-k0s.yml b/.github/workflows/build-k0s.yml
index 83533d51176c..5544e44c30db 100644
--- a/.github/workflows/build-k0s.yml
+++ b/.github/workflows/build-k0s.yml
@@ -12,6 +12,9 @@ on:
         required: true
         description: The architecture to build k0s for.
 
+env:
+  MAKEFLAGS: -j
+
 jobs:
   build:
     name: ${{ inputs.target-os }}-${{ inputs.target-arch }}
diff --git a/.github/workflows/check-network.yaml b/.github/workflows/check-network.yaml
index 2f2ca20f4e12..dc457f828625 100644
--- a/.github/workflows/check-network.yaml
+++ b/.github/workflows/check-network.yaml
@@ -8,6 +8,9 @@ on:
   schedule:
     - cron: "0 23 * * *"
 
+env:
+  MAKEFLAGS: -j
+
 jobs:
   check-network:
     env:
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index bb7902b81bf1..18948b79e6c5 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -28,6 +28,9 @@ on:
       - '.github/workflows/mkdocs-set-default-version.yml'
       - 'mkdocs.yml'
 
+env:
+  MAKEFLAGS: -j
+
 jobs:
   prepare:
     name: Prepare
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 6535623a2d0d..3665f1d3554f 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -29,6 +29,9 @@ on:
       - 'mkdocs.yml'
       - '*.md'
 
+env:
+  MAKEFLAGS: -j
+
 jobs:
   lint:
     name: Lint
diff --git a/.github/workflows/ostests-e2e.yaml b/.github/workflows/ostests-e2e.yaml
index a7269dd80447..5c34c3aa6fa9 100644
--- a/.github/workflows/ostests-e2e.yaml
+++ b/.github/workflows/ostests-e2e.yaml
@@ -51,6 +51,7 @@ env:
   # This is hopefully somewhat physically close to where the hosted GitHub runners live.
   # https://github.com/orgs/community/discussions/24969#discussioncomment-3246032
   AWS_REGION: us-east-1
+  MAKEFLAGS: -j
 
 jobs:
   e2e-tests:
diff --git a/.github/workflows/publish-docs-manual.yml b/.github/workflows/publish-docs-manual.yml
index 4b2fc0699d7e..a6efeaa90c36 100644
--- a/.github/workflows/publish-docs-manual.yml
+++ b/.github/workflows/publish-docs-manual.yml
@@ -7,6 +7,7 @@ on:
         required: true
 
 env:
+  MAKEFLAGS: -j
   PYTHON_VERSION: 3.x
   TARGET_VERSION: ${{ github.event.inputs.version }}
 
diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
index ce6a756bec50..272656d8a8d3 100644
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -7,6 +7,9 @@ on:
     types:
       - published
 
+env:
+  MAKEFLAGS: -j
+
 jobs:
   build:
     name: Deploy docs
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e6d5db5c8c46..5560cca5156c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,6 +7,7 @@ on:
 
 env:
   K0SCTL_VERSION: 0.13.2
+  MAKEFLAGS: -j
 
 jobs:
   release:
diff --git a/.github/workflows/sbom-upload.yml b/.github/workflows/sbom-upload.yml
index 6dff9b134361..67a41b046b2d 100644
--- a/.github/workflows/sbom-upload.yml
+++ b/.github/workflows/sbom-upload.yml
@@ -6,6 +6,9 @@ on:
     branches:
       - main
 
+env:
+  MAKEFLAGS: -j
+
 jobs:
   sbom-upload:
     runs-on: ubuntu-latest
diff --git a/vars.sh b/vars.sh
index 28d189c32902..dac7eb4574ca 100755
--- a/vars.sh
+++ b/vars.sh
@@ -2,6 +2,9 @@
 
 set -eu
 
+# Don't deal with recursive make stuff here!
+unset -v MAKEFLAGS MAKELEVEL
+
 from=
 var=