Skip to content

Commit

Permalink
feature/auto-merge-controls (#3)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
mbakgun authored Nov 15, 2024
1 parent 0ca7adf commit c282a3a
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
21 changes: 19 additions & 2 deletions .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Auto Merge Pull Requests
name: Auto Merge Pull Requests Checks
on:
pull_request:
branches:
Expand All @@ -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/[email protected]
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]"
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ kotlin.code.style=official
kotlin.daemon.jvmargs=-Xmx2048M

#Gradle
org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8

#Compose
compose.desktop.packaging.checkJdkVendor=false

0 comments on commit c282a3a

Please sign in to comment.