Просмотр исходного кода

Add separate workflow config for PR and master (#2)

Joshua Kuestersteffen 6 лет назад
Родитель
Сommit
72604039f4

+ 0 - 17
.github/workflows/android.yml

@@ -1,17 +0,0 @@
-name: Android CI
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Build with Gradle
-        run: ./gradlew build

+ 22 - 0
.github/workflows/android_branch_ci.yml

@@ -0,0 +1,22 @@
+# Builds the project
+name: Android Feature Branch CI
+
+on:
+  push:
+    branches:
+      - '*'
+      - '!master'
+
+jobs:
+  build:
+    name: Build the project
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build with Gradle
+        run: ./gradlew build

+ 34 - 0
.github/workflows/android_master_ci.yml

@@ -0,0 +1,34 @@
+# Builds the project, signs an API, and then uploads it
+name: Android Master Branch CI
+
+on:
+  push:
+    branches:
+      - 'master'
+
+jobs:
+  build:
+    name: Build the project
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build with Gradle
+        run: ./gradlew build
+      - name: Build Signed APK
+        uses: r0adkll/sign-android-release@v1
+        with:
+          releaseDirectory: app/build/outputs/apk/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.ALIAS }}
+          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+          keyPassword: ${{ secrets.KEY_PASSWORD }}
+      - name: Upload APK
+        uses: actions/upload-artifact@v1
+        with:
+          name: app
+          path: app/build/outputs/apk/release/com.jkuester.unlauncher-signed.apk

+ 26 - 0
.github/workflows/android_pr_ci.yml

@@ -0,0 +1,26 @@
+# Builds the project and uploads a debug APK
+name: Android PR CI
+
+on:
+  pull_request:
+    branches:
+      - 'master'
+
+jobs:
+  build:
+    name: Build the project
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build with Gradle
+        run: ./gradlew build
+      - name: Upload APK
+        uses: actions/upload-artifact@v1
+        with:
+          name: app
+          path: app/build/outputs/apk/debug/com.jkuester.unlauncher.debug.apk

+ 6 - 1
app/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 41
-        versionName "2.4.6"
+        versionName "0.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -45,6 +45,11 @@ android {
     lintOptions{
         disable 'MissingTranslation'
     }
+    applicationVariants.all { variant ->
+        variant.outputs.all {
+            outputFileName = "${applicationId}.apk"
+        }
+    }
 }
 
 dependencies {

BIN
app/src/main/ic_launcher-web.png