From c282a3a6812d8f8c1302cda889fca092224dc19b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20Akg=C3=BCn?= <burak.akgun@trendyol.com>
Date: Fri, 15 Nov 2024 21:05:01 +0100
Subject: [PATCH] feature/auto-merge-controls (#3)

* Add build steps for web and desktop apps in auto-merge workflow

* Add Compose packaging option and update auto-merge workflow build tasks

* Update build tasks to use wasmJs for web app in auto-merge workflow

* Update GitHub Actions to use checkout v4 and setup-java v4 versions and temurin distribution

* Update workflow to use JDK 17 with Gradle caching for efficiency
---
 .github/workflows/dependabot-auto-merge.yml | 21 +++++++++++++++++++--
 gradle.properties                           |  5 ++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
index f0c7e04..0783225 100644
--- a/.github/workflows/dependabot-auto-merge.yml
+++ b/.github/workflows/dependabot-auto-merge.yml
@@ -1,4 +1,4 @@
-name: Auto Merge Pull Requests
+name: Auto Merge Pull Requests Checks
 on:
   pull_request:
     branches:
@@ -14,11 +14,28 @@ jobs:
       contents: write
       pull-requests: write
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: 'adopt'
+          cache: 'gradle'
+
+      - name: Build Web Application
+        run: ./gradlew :composeApp:wasmJsBrowserDevelopmentExecutableDistribution
+
+      - name: Build Desktop Application
+        run: ./gradlew :composeApp:packageDistributionForCurrentOS
+
       - name: Automatically Merge Dependabot PRs
+        if: success()
         uses: pascalgn/automerge-action@v0.15.6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           MERGE_LABELS: "dependencies"
           MERGE_METHOD: "squash"
           MERGE_COMMIT_MESSAGE: "pull-request-title"
-          MERGE_FILTER_AUTHOR: "dependabot[bot]"
+          MERGE_FILTER_AUTHOR: "dependabot[bot]"
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index ddad6aa..73832e7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,7 @@ kotlin.code.style=official
 kotlin.daemon.jvmargs=-Xmx2048M
 
 #Gradle
-org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8
\ No newline at end of file
+org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8
+
+#Compose
+compose.desktop.packaging.checkJdkVendor=false
\ No newline at end of file