summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2025-09-18 12:20:17 +0200
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-09-18 12:20:17 +0200
commit306164574c3e8c8d0c03d12d8d80564db9bd4f67 (patch)
treeaf574a9e99a358b7e4554b46f09ec53917d455f1
parentd7338f2065ab26686cbae3c99693d4d95800175a (diff)
parent0679a61f81ab90cadcbfa9578ff262f77d02a29b (diff)
downloadmullvadvpn-306164574c3e8c8d0c03d12d8d80564db9bd4f67.tar.xz
mullvadvpn-306164574c3e8c8d0c03d12d8d80564db9bd4f67.zip
Merge branch 'lower-concurrent-process-in-windows-11-arm-build-job'
-rw-r--r--.github/workflows/daemon.yml2
-rw-r--r--.github/workflows/git-commit-message-style.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/daemon.yml b/.github/workflows/daemon.yml
index c2e7df53eb..49fefca8c5 100644
--- a/.github/workflows/daemon.yml
+++ b/.github/workflows/daemon.yml
@@ -205,7 +205,7 @@ jobs:
# https://docs.github.com/en/actions/how-tos/write-workflows/choose-where-workflows-run/choose-the-runner-for-a-job#standard-github-hosted-runners-for-public-repositories
#
# Cap the number of concurrent processes to something less than 4 to avoid OOM issues.
- run: ./build-windows-modules.sh --max-concurrent-processes 3
+ run: ./build-windows-modules.sh --max-concurrent-processes 2
- name: Build and test crates
shell: bash
diff --git a/.github/workflows/git-commit-message-style.yml b/.github/workflows/git-commit-message-style.yml
index 53877a5d69..3b3142a4e0 100644
--- a/.github/workflows/git-commit-message-style.yml
+++ b/.github/workflows/git-commit-message-style.yml
@@ -35,4 +35,4 @@ jobs:
max-subject-line-length: '72'
# The action's wordlist is a bit short. Add more accepted verbs
additional-verbs: 'tidy, wrap, obfuscate, bias, prohibit, forbid, revert, slim, impl, disregard, reproduce,
- signal, guarantee'
+ signal, guarantee, cap'