From aaf83f42a361a5e7e1f5842ebae227970bcd39c7 Mon Sep 17 00:00:00 2001
From: Victor Martinez <victormartinezrubio@gmail.com>
Date: Fri, 29 Sep 2023 12:48:39 +0200
Subject: [PATCH 1/2] action: use latest version for the cleanup (#3337)

* action: use https://github.com/jlumbroso/free-disk-space/releases/tag/v1.3.0

* continue on error

* action: use free-disk-space action in non-app-server-integration-tests
---
 .github/workflows/main.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 04410dc9bf..9aa49d1c72 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -176,6 +176,18 @@ jobs:
         with:
           name: build
           path: ${{ github.workspace }}
+      # As long as there are some space issues with the CI runners.
+      - name: Free Disk Space
+        continue-on-error: true
+        uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8
+        with:
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true
+          tool-cache: false
       - uses: ./.github/workflows/maven-goal
         with:
           command: ./mvnw -q -P ci-non-application-server-integration-tests verify
@@ -205,7 +217,8 @@ jobs:
           path: ${{ github.workspace }}
       # As long as there are some space issues with the CI runners.
       - name: Free Disk Space
-        uses: jlumbroso/free-disk-space@0add001504c51b93b35ac8e81d252bdd47e4ef07
+        continue-on-error: true
+        uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8
         with:
           android: true
           dotnet: true

From 085c2ad4365ff4a46a15b8b45c5a740f5a8e901e Mon Sep 17 00:00:00 2001
From: SylvainJuge <763082+SylvainJuge@users.noreply.github.com>
Date: Fri, 29 Sep 2023 13:43:10 +0200
Subject: [PATCH 2/2] add minimal mergify config (#3338)

* add minimal mergify config

* add rule with label for PRs
---
 .mergify.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .mergify.yml

diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 0000000000..d86ece6e7c
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,13 @@
+queue_rules:
+  - name: default
+  # branch protection rules are automatically included, no extra rule needed for now
+
+pull_request_rules:
+  - name: Automatic squash and merge on approval with success checks and ready-to-merge label
+    conditions:
+      - label=ready-to-merge
+      - base=main
+    actions:
+      queue:
+        method: squash
+        name: default