Limit concurrency

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3857c01e0d4c7657553fcf1df8dd1c436c8cc4e3..104b12d47557cee79c1f3882f99bcd28a07a1b8c 100644 (file)
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -208,7 +208,7 @@ jobs:
       if: matrix.product == 'rec'
       working-directory: ./pdns/recursordist/
       run: |
-        inv ci-rec-make-bear
+        CONCURRENCY=4 inv ci-rec-make-bear
     - run: ln -s .clang-tidy.full .clang-tidy
       if: matrix.product == 'rec'
     - run: cp ./pdns/recursordist/compile_commands.json .

diff --git a/tasks.py b/tasks.py
index 0d98603ab212c59bc0372b7c9338c4cab78c1741..66cc25e929ef7b985c0a281d3ce58dc693ee1aba 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -590,31 +590,37 @@ def ci_dnsdist_configure(c, features):
 
 @task
 def ci_auth_make(c):
-    c.run('make -j8 -k V=1')
+    concurrency = os.getenv('CONCURRENCY', 8)
+    c.run(f'make -j{concurrency} -k V=1')
 
 @task
 def ci_auth_make_bear(c):
+    concurrency = os.getenv('CONCURRENCY', 8)
     # Needed for clang-tidy -line-filter vs project structure shenanigans
     with c.cd('pdns'):
-        c.run('bear --append -- make -j8 -k V=1 -C ..')
+        c.run(f'bear --append -- make -j{concurrency} -k V=1 -C ..')
 
 @task
 def ci_rec_make(c):
-    c.run('make -j8 -k V=1')
+    concurrency = os.getenv('CONCURRENCY', 8)
+    c.run(f'make -j{concurrency} -k V=1')
 
 @task
 def ci_rec_make_bear(c):
+    concurrency = os.getenv('CONCURRENCY', 8)
     # Assumed to be running under ./pdns/recursordist/
-    c.run('bear --append -- make -j8 -k V=1')
+    c.run(f'bear --append -- make -j{concurrency} -k V=1')
 
 @task
 def ci_dnsdist_make(c):
-    c.run('make -j4 -k V=1')
+    concurrency = os.getenv('CONCURRENCY', 4)
+    c.run(f'make -j{concurrency} -k V=1')
 
 @task
 def ci_dnsdist_make_bear(c):
+    concurrency = os.getenv('CONCURRENCY', 4)
     # Assumed to be running under ./pdns/dnsdistdist/
-    c.run('bear --append -- make -j4 -k V=1')
+    c.run(f'bear --append -- make -j{concurrency} -k V=1')
 
 @task
 def ci_auth_install_remotebackend_test_deps(c):