From a7172ec91e08fe9190696cd278623ea9e4045d25 Mon Sep 17 00:00:00 2001 From: Louis Date: Fri, 5 Jul 2024 10:54:32 +0200 Subject: [PATCH 1/3] Reported by user that without get it does not build on Windows --- zeapp/android/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeapp/android/build.gradle.kts b/zeapp/android/build.gradle.kts index d6dfb7b7..4000aa12 100644 --- a/zeapp/android/build.gradle.kts +++ b/zeapp/android/build.gradle.kts @@ -111,7 +111,7 @@ android { } sourceSets.getByName("main").assets.srcDir( - "${layout.buildDirectory}/generated/assets", + "${layout.buildDirectory.get()}/generated/assets", ) compileOptions { From 64d55fd524fd74e6cf2fa7bf9a3bd73aacfa5ede Mon Sep 17 00:00:00 2001 From: Louis Tsai Date: Fri, 5 Jul 2024 10:56:24 +0200 Subject: [PATCH 2/3] Add CI step --- .github/workflows/pr.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b94c0d21..0ea24544 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -33,7 +33,27 @@ jobs: with: name: Debug APK path: zeapp/android/build/outputs/apk/debug/android-debug.apk - + build-debug-windows: + runs-on: windows-latest + steps: + - name: "Checkout Repo" + uses: actions/checkout@v4 + - name: "Setup Java 17" + uses: actions/setup-java@v4 + with: + distribution: "temurin" + java-version: 17 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + - name: "Validate Gradle wrapper" + uses: gradle/actions/wrapper-validation@v3 + - name: "Assemble Debug" + run: ./gradlew :android:assembleDebug --no-daemon + - name: "Upload Debug APK to GitHub" + uses: actions/upload-artifact@v4 + with: + name: Debug APK + path: zeapp/android/build/outputs/apk/debug/android-debug.apk ktlint: runs-on: ubuntu-latest steps: From 748e129752bc2d90740d6ec1e4e57e0d314d4eec Mon Sep 17 00:00:00 2001 From: Louis Tsai Date: Fri, 5 Jul 2024 11:07:21 +0200 Subject: [PATCH 3/3] Update pr.yml --- .github/workflows/pr.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0ea24544..186abe48 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -49,11 +49,7 @@ jobs: uses: gradle/actions/wrapper-validation@v3 - name: "Assemble Debug" run: ./gradlew :android:assembleDebug --no-daemon - - name: "Upload Debug APK to GitHub" - uses: actions/upload-artifact@v4 - with: - name: Debug APK - path: zeapp/android/build/outputs/apk/debug/android-debug.apk + # Not uploading the APK cause the other step will generate the same thing anyway ktlint: runs-on: ubuntu-latest steps: