Merge branch 'main' of github.com:elastic/apm-agent-java into es-sync…

…-attribute

.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

.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