From ed94aa35efe53c2eb8cfb317add4b905056439ef Mon Sep 17 00:00:00 2001
From: lotyp <lotyp7@gmail.com>
Date: Tue, 21 Mar 2023 14:11:58 +0200
Subject: [PATCH] fix: makefile, formatting

---
 .github/workflows/ci-apps-web.yml           |  1 +
 .github/workflows/ci-packages.yml           |  1 +
 .github/workflows/codeql-analysis.yml.dist  | 13 ++++++-------
 .github/workflows/release-or-version-pr.yml |  2 +-
 Makefile                                    |  6 +++++-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci-apps-web.yml b/.github/workflows/ci-apps-web.yml
index a1fb7e97..df1176a0 100644
--- a/.github/workflows/ci-apps-web.yml
+++ b/.github/workflows/ci-apps-web.yml
@@ -1,5 +1,6 @@
 ---
 on: # yamllint disable-line rule:truthy
+  merge_group:
   push:
     branches:
       - master
diff --git a/.github/workflows/ci-packages.yml b/.github/workflows/ci-packages.yml
index 5e60b9f6..cac9b9a0 100644
--- a/.github/workflows/ci-packages.yml
+++ b/.github/workflows/ci-packages.yml
@@ -1,5 +1,6 @@
 ---
 on: # yamllint disable-line rule:truthy
+  merge_group:
   push:
     branches:
       - master
diff --git a/.github/workflows/codeql-analysis.yml.dist b/.github/workflows/codeql-analysis.yml.dist
index 9c1a2268..3b3ceb33 100644
--- a/.github/workflows/codeql-analysis.yml.dist
+++ b/.github/workflows/codeql-analysis.yml.dist
@@ -1,6 +1,6 @@
 ---
 
-on: # yamllint disable-line rule:truthy
+on:  # yamllint disable-line rule:truthy
   push:
     branches:
       - master
@@ -10,11 +10,10 @@ on: # yamllint disable-line rule:truthy
   schedule:
     - cron: '22 6 * * 0'
 
-name: CodeQL
+name: 🐞 CodeQL
 
 jobs:
   analyze:
-    name: Analyze
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -28,18 +27,18 @@ jobs:
           - javascript
 
     steps:
-      - name: Checkout repository
+      - name: 📦 Check out the codebase
         uses: actions/checkout@v3
 
-      - name: Initialize CodeQL
+      - name: 🤖 Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
 
-      - name: Autobuild
+      - name: 🛠️ Autobuild
         uses: github/codeql-action/autobuild@v2
 
-      - name: Perform CodeQL Analysis
+      - name: 🚨 Perform CodeQL analysis
         uses: github/codeql-action/analyze@v2
 
 ...
diff --git a/.github/workflows/release-or-version-pr.yml b/.github/workflows/release-or-version-pr.yml
index 7e044c39..755bf3cd 100644
--- a/.github/workflows/release-or-version-pr.yml
+++ b/.github/workflows/release-or-version-pr.yml
@@ -51,5 +51,5 @@ jobs:
         env:
           # See https://github.com/changesets/action/issues/147
           HOME: ${{ github.workspace }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/Makefile b/Makefile
index 25b89a41..e93ba9a3 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,11 @@ DOCKER_COMPOSE ?= docker-compose
 # Support image with all needed binaries, like envsubst, mkcert, wait4x
 SUPPORT_IMAGE ?= wayofdev/build-deps:alpine-latest
 
-BUILDER_PARAMS ?= docker run --rm -i \
+BUILDER_PARAMS ?= docker run \
+ 	--rm \
+ 	-i \
+ 	-v $(PWD):/app \
+ 	--workdir /app \
 	--env-file ./.env \
 	--env APP_NAME=$(APP_NAME) \
 	--env SYSTEM_SERVICES_NAMESPACE=$(SYSTEM_SERVICES_NAMESPACE) \