From 16cb5ba9b63f0ef339aa893fe55b54629731770e Mon Sep 17 00:00:00 2001 From: Stardust Date: Thu, 14 Nov 2019 20:20:54 +0800 Subject: [PATCH 01/11] Create android.yml --- .github/workflows/android.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/android.yml diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml new file mode 100644 index 00000000..3071e5de --- /dev/null +++ b/.github/workflows/android.yml @@ -0,0 +1,17 @@ +name: Android CI + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Build with Gradle + run: ./gradlew build From f2bce4a31e75d68e4d96d1c0d2c75c3e741d48f1 Mon Sep 17 00:00:00 2001 From: Stardust Date: Thu, 14 Nov 2019 21:18:10 +0800 Subject: [PATCH 02/11] Update android.yml --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 3071e5de..53a2401a 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -14,4 +14,4 @@ jobs: with: java-version: 1.8 - name: Build with Gradle - run: ./gradlew build + run: chmod 777 ./gradlew && ./gradlew build From 0515b5eefa32b4abbda3469a0079816deb2056c8 Mon Sep 17 00:00:00 2001 From: Stardust Date: Sun, 1 Dec 2019 20:05:28 +0800 Subject: [PATCH 03/11] disable autojs abortOnError --- autojs/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/autojs/build.gradle b/autojs/build.gradle index 4fec1558..7269c925 100644 --- a/autojs/build.gradle +++ b/autojs/build.gradle @@ -27,6 +27,9 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + lintOptions { + abortOnError false + } } repositories { From 36378d87221e51a8a262e3b5ddb189fb2a90d11d Mon Sep 17 00:00:00 2001 From: Stardust Date: Sun, 1 Dec 2019 20:06:00 +0800 Subject: [PATCH 04/11] disable automator abortOnError --- automator/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/automator/build.gradle b/automator/build.gradle index bbc0f88f..89a009f6 100644 --- a/automator/build.gradle +++ b/automator/build.gradle @@ -19,6 +19,9 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + lintOptions { + abortOnError false + } buildTypes { release { minifyEnabled false From 89149e0548a931a3c2bbbc1dbdbe7d815a688667 Mon Sep 17 00:00:00 2001 From: Stardust Date: Sun, 1 Dec 2019 20:06:24 +0800 Subject: [PATCH 05/11] Disable common abortOnError --- common/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/build.gradle b/common/build.gradle index 0ee577bd..d14f7639 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -22,6 +22,9 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + lintOptions { + abortOnError false + } } dependencies { From 83e6c7cf3e29ed3351e7ff93e486db45538a30ea Mon Sep 17 00:00:00 2001 From: Stardust Date: Sun, 1 Dec 2019 20:06:58 +0800 Subject: [PATCH 06/11] Disable inrt abortOnError --- inrt/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/inrt/build.gradle b/inrt/build.gradle index 3d8319ac..f8973cc3 100644 --- a/inrt/build.gradle +++ b/inrt/build.gradle @@ -16,6 +16,7 @@ android { multiDexEnabled true } lintOptions { + abortOnError false disable 'MissingTranslation' disable 'ExtraTranslation' } From 23eb0df44ddaf15be3e5469fb0e1a7e2072aef61 Mon Sep 17 00:00:00 2001 From: Stardust Date: Sun, 1 Dec 2019 20:18:58 +0800 Subject: [PATCH 07/11] CI: Run app assembleRelease --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 53a2401a..69487f68 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -14,4 +14,4 @@ jobs: with: java-version: 1.8 - name: Build with Gradle - run: chmod 777 ./gradlew && ./gradlew build + run: chmod 777 ./gradlew && ./gradlew :app:assembleRelease From 2d82c703292dd94397922f50f36558fe16ec24bf Mon Sep 17 00:00:00 2001 From: Stardust Date: Sun, 1 Dec 2019 20:21:58 +0800 Subject: [PATCH 08/11] Remove Test Code --- .../com/stardust/autojs/ExampleUnitTest.java | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/autojs/src/test/java/com/stardust/autojs/ExampleUnitTest.java b/autojs/src/test/java/com/stardust/autojs/ExampleUnitTest.java index 7a4e3be7..936c62b3 100644 --- a/autojs/src/test/java/com/stardust/autojs/ExampleUnitTest.java +++ b/autojs/src/test/java/com/stardust/autojs/ExampleUnitTest.java @@ -25,23 +25,6 @@ public class ExampleUnitTest { @Test - public void test() throws IOException { - File file = new File("C:\\Users\\Stardust\\Desktop\\1.txt"); - System.out.println(PFiles.read(file)); - String url = "http://posttestserver.com/post.php?dir=example"; - OkHttpClient client = new OkHttpClient(); - RequestBody formBody = new MultipartBody.Builder() - .setType(MultipartBody.FORM) - .addFormDataPart("file", file.getName(), - RequestBody.create(MediaType.parse("text/plain"), file)) - .addFormDataPart("other_field", "other_field_value") - .build(); - Request request = new Request.Builder().url(url).post(formBody).build(); - Response response = client.newCall(request).execute(); - System.out.println(response.body().string()); + public void test() { } - - public boolean equals(int i, int j) { - return i == j; - } -} \ No newline at end of file +} From bfb952f18749db37e0ffc0e874483f440026341e Mon Sep 17 00:00:00 2001 From: Stardust Date: Sun, 1 Dec 2019 20:59:15 +0800 Subject: [PATCH 09/11] Upload release apk --- .github/workflows/android.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 69487f68..5880d897 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -15,3 +15,9 @@ jobs: java-version: 1.8 - name: Build with Gradle run: chmod 777 ./gradlew && ./gradlew :app:assembleRelease + - name: Upload apk + uses: actions/upload-artifact@v1 + with: + name: app-release.apk + path: app/build/outputs/apk/release/app-release.apk + From dfaeab65601fd7af2daedd112a7d9402b6ee48fa Mon Sep 17 00:00:00 2001 From: Stardust Date: Sun, 1 Dec 2019 21:07:39 +0800 Subject: [PATCH 10/11] List build outputs --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 5880d897..2a83227c 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -14,7 +14,7 @@ jobs: with: java-version: 1.8 - name: Build with Gradle - run: chmod 777 ./gradlew && ./gradlew :app:assembleRelease + run: chmod 777 ./gradlew && ./gradlew :app:assembleRelease && find app/build/outputs - name: Upload apk uses: actions/upload-artifact@v1 with: From cc147bcb53eae5fe77c168f6fd5b238694124a1a Mon Sep 17 00:00:00 2001 From: Stardust Date: Sun, 1 Dec 2019 21:14:04 +0800 Subject: [PATCH 11/11] Fix output apk path --- .github/workflows/android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 2a83227c..78a95902 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -18,6 +18,6 @@ jobs: - name: Upload apk uses: actions/upload-artifact@v1 with: - name: app-release.apk - path: app/build/outputs/apk/release/app-release.apk + name: app-armeabi-v7a-release-unsigned.apk + path: app/build/outputs/apk/common/release/app-common-armeabi-v7a-release-unsigned.apk