From 7e7f238f917c49514de62877a18408b1be4b06b0 Mon Sep 17 00:00:00 2001 From: Andre Kirchhoff Date: Tue, 30 Nov 2021 10:49:27 -0300 Subject: [PATCH 1/5] CI improvements --- .github/workflows/android.yml | 82 +++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 32 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 9f45ba0dc..c7f7ce587 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -1,41 +1,59 @@ name: Android CI -# from https://medium.com/@wkrzywiec/github-actions-for-android-first-approach-f616c24aa0f9 on: - - push - - pull_request + push: + pull_request: jobs: - test: - name: Test + + ci-build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - with: - submodules: true - - name: Loading secrets - run: | - # not yet needed echo $gservices > ./app/google-services.json - rm ./app/google-services.json - cp ./app/google-services-example.json ./app/google-services.json - rm ./app/src/main/res/values/mapbox-token.xml - cp ./app/special/mapbox-token.xml ./app/src/main/res/values/ - # The following would not be valid XML, don't use yet - # echo $MAPBOXTOKEN > ./app/src/main/res/values/mapbox-token.xml - mkdir -p ~/.gradle - echo "MAPBOX_DOWNLOADS_TOKEN=$MAPBOXTOKEN" >>~/.gradle/gradle.properties - env: - gservices: ${{ secrets.gservices }} + + - name: Checkout code + uses: actions/checkout@v2 + with: + submodules: 'recursive' + + - name: Load secrets + run: | + # not yet needed echo $GSERVICES > ./app/google-services.json + rm ./app/google-services.json + cp ./app/google-services-example.json ./app/google-services.json + rm ./app/src/main/res/values/mapbox-token.xml + cp ./app/special/mapbox-token.xml ./app/src/main/res/values/ + # The following would not be valid XML, don't use yet + # echo $MAPBOXTOKEN > ./app/src/main/res/values/mapbox-token.xml + mkdir -p ~/.gradle + echo "MAPBOX_DOWNLOADS_TOKEN=$MAPBOXTOKEN" >>~/.gradle/gradle.properties + env: + GSERVICES: ${{ secrets.GSERVICES }} MAPBOXTOKEN: ${{ secrets.MAPBOXTOKEN }} - - name: Mock curfirmware version for CI - run: | - rm ./app/src/main/res/values/curfirmwareversion.xml - cp ./app/special/curfirmwareversion.xml ./app/src/main/res/values/ - - name: set up Java - uses: actions/setup-java@v2 - with: - distribution: "adopt" - java-version: 16 - - name: Unit tests - run: bash ./gradlew test --stacktrace + + - name: Mock curfirmware version for CI + run: | + rm ./app/src/main/res/values/curfirmwareversion.xml + cp ./app/special/curfirmwareversion.xml ./app/src/main/res/values/ + + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: 11 + distribution: 'adopt' + cache: gradle + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@v1 + + - name: Integration test + run: ./gradlew test --stacktrace + + - name: Build debug APK + run: ./gradlew assembleDebug + + - name: Upload APK + uses: actions/upload-artifact@v2 + with: + name: app-debug + path: app/build/outputs/apk/debug/app-debug.apk + retention-days: 30 From 45217796782ddcbb94a3c447250fe35ff1c0bcf2 Mon Sep 17 00:00:00 2001 From: Andre Kirchhoff Date: Wed, 1 Dec 2021 21:45:32 -0300 Subject: [PATCH 2/5] mapbox-token.xml --- .github/workflows/android.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index c7f7ce587..075fb614a 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -21,9 +21,7 @@ jobs: rm ./app/google-services.json cp ./app/google-services-example.json ./app/google-services.json rm ./app/src/main/res/values/mapbox-token.xml - cp ./app/special/mapbox-token.xml ./app/src/main/res/values/ - # The following would not be valid XML, don't use yet - # echo $MAPBOXTOKEN > ./app/src/main/res/values/mapbox-token.xml + echo "\n $MAPBOXTOKEN\n" > ./app/src/main/res/values/mapbox-token.xml mkdir -p ~/.gradle echo "MAPBOX_DOWNLOADS_TOKEN=$MAPBOXTOKEN" >>~/.gradle/gradle.properties env: From 6fff6ef6dd03c7c46ef260e54701dc42fea1c8a8 Mon Sep 17 00:00:00 2001 From: Andre Kirchhoff Date: Tue, 7 Dec 2021 16:04:25 -0300 Subject: [PATCH 3/5] add google-services.json --- .github/workflows/android.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 075fb614a..b4d5e7f6b 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -17,9 +17,8 @@ jobs: - name: Load secrets run: | - # not yet needed echo $GSERVICES > ./app/google-services.json - rm ./app/google-services.json - cp ./app/google-services-example.json ./app/google-services.json + rm ./app/google-services.json + echo $GSERVICES > ./app/google-services.json rm ./app/src/main/res/values/mapbox-token.xml echo "\n $MAPBOXTOKEN\n" > ./app/src/main/res/values/mapbox-token.xml mkdir -p ~/.gradle From a1bdb0863add310ed15b7195373fd5523b83e1c1 Mon Sep 17 00:00:00 2001 From: Andre Kirchhoff Date: Tue, 7 Dec 2021 16:11:07 -0300 Subject: [PATCH 4/5] ignore cert keys and mapbox token --- .gitignore | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d8d02ed8f..48377fe8f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,11 @@ /captures .externalNativeBuild .cxx -/app/release \ No newline at end of file +/app/release + +# Java KeyStore certificates +*.jks +keystore.properties + +# Mapbox token file +/app/src/main/res/values/mapbox-token.xml From 7dbc72c45522b72b409c3008ece9427e3acf5c1e Mon Sep 17 00:00:00 2001 From: Andre Kirchhoff Date: Tue, 7 Dec 2021 17:05:45 -0300 Subject: [PATCH 5/5] spacing --- .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 b4d5e7f6b..bc7da1edb 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -24,8 +24,8 @@ jobs: mkdir -p ~/.gradle echo "MAPBOX_DOWNLOADS_TOKEN=$MAPBOXTOKEN" >>~/.gradle/gradle.properties env: - GSERVICES: ${{ secrets.GSERVICES }} - MAPBOXTOKEN: ${{ secrets.MAPBOXTOKEN }} + GSERVICES: ${{ secrets.GSERVICES }} + MAPBOXTOKEN: ${{ secrets.MAPBOXTOKEN }} - name: Mock curfirmware version for CI run: |