From 3d283d0213220615614265d7f85e6181a21a4c02 Mon Sep 17 00:00:00 2001
From: iphydf <iphydf@users.noreply.github.com>
Date: Wed, 22 Nov 2023 21:28:18 +0000
Subject: [PATCH] chore: Cancel old PR builds on docker and sonar-scan
 workflows.

---
 .github/workflows/docker.yml         | 5 +++++
 .github/workflows/sonar-scan.yml     | 5 +++++
 other/docker/alpine-s390x/Dockerfile | 2 +-
 other/docker/freebsd/Dockerfile      | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 49210130f69..f282e96194c 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -6,6 +6,11 @@ on:
   pull_request:
     branches: [master]
 
+# Cancel old PR builds when pushing new commits.
+concurrency:
+  group: build-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   docker-bootstrap-node:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml
index 45e32dd1bfe..54564a8233e 100644
--- a/.github/workflows/sonar-scan.yml
+++ b/.github/workflows/sonar-scan.yml
@@ -6,6 +6,11 @@ on:
   pull_request:
     branches: [master]
 
+# Cancel old PR builds when pushing new commits.
+concurrency:
+  group: build-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   sonar-scan:
     runs-on: ubuntu-latest
diff --git a/other/docker/alpine-s390x/Dockerfile b/other/docker/alpine-s390x/Dockerfile
index 86b1f1fd651..8ac76797a83 100644
--- a/other/docker/alpine-s390x/Dockerfile
+++ b/other/docker/alpine-s390x/Dockerfile
@@ -3,4 +3,4 @@ FROM toxchat/alpine-s390x:latest
 WORKDIR /work/c-toxcore
 COPY . /work/c-toxcore/
 
-RUN .github/scripts/cmake-alpine-s390x
+RUN [".github/scripts/cmake-alpine-s390x"]
diff --git a/other/docker/freebsd/Dockerfile b/other/docker/freebsd/Dockerfile
index 6e933d0fbcf..9c5f09e2110 100644
--- a/other/docker/freebsd/Dockerfile
+++ b/other/docker/freebsd/Dockerfile
@@ -3,4 +3,4 @@ FROM toxchat/freebsd:latest
 WORKDIR /work/c-toxcore
 COPY . /work/c-toxcore/
 
-RUN .github/scripts/cmake-freebsd
+RUN [".github/scripts/cmake-freebsd"]