From a3dc5641542d9ddde5cc473bbd95114533b45fa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A3=D1=85=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=90=D0=BD=D1=82?= =?UTF-8?q?=D0=BE=D0=BD?= Date: Thu, 22 Oct 2020 11:14:11 +0300 Subject: [PATCH 01/10] Created Android pipeline --- .github/workflows/android.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 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 00000000000..ec94e34ae15 --- /dev/null +++ b/.github/workflows/android.yml @@ -0,0 +1,27 @@ +name: Android CI + +on: + push: + branches: [ master ] + pull_request: + types: [assigned, opened, synchronize, reopened] + +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: Install ndk + run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT} + + - name: Configure + run: ./configure.sh + + - name: Build with Gradle + run: cd android && ./gradlew aR From ee9dd7440222b6bb697addf9fe46c754492d886c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A3=D1=85=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=90=D0=BD=D1=82?= =?UTF-8?q?=D0=BE=D0=BD?= Date: Thu, 22 Oct 2020 11:21:04 +0300 Subject: [PATCH 02/10] Added submodules update --- .github/workflows/android.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index ec94e34ae15..97ffb421bd5 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -19,7 +19,10 @@ jobs: java-version: 1.8 - name: Install ndk run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT} - + + - name: Update Submodules + run: git submodule update --init --recursive + - name: Configure run: ./configure.sh From 5188897626b5ec3a12769a51dab53a4a6712ad37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A3=D1=85=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=90=D0=BD=D1=82?= =?UTF-8?q?=D0=BE=D0=BD?= Date: Thu, 22 Oct 2020 11:23:14 +0300 Subject: [PATCH 03/10] changed gradle run arg --- .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 97ffb421bd5..e675998b5c5 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -27,4 +27,4 @@ jobs: run: ./configure.sh - name: Build with Gradle - run: cd android && ./gradlew aR + run: cd android && ./gradlew aWR From f323f50514871353ba59cbec434ee721c6e061f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A3=D1=85=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=90=D0=BD=D1=82?= =?UTF-8?q?=D0=BE=D0=BD?= Date: Thu, 22 Oct 2020 11:26:11 +0300 Subject: [PATCH 04/10] syntax fix --- .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 e675998b5c5..a4c80b1c2bd 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -20,7 +20,7 @@ jobs: - name: Install ndk run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT} - - name: Update Submodules + - name: Update Submodules run: git submodule update --init --recursive - name: Configure From f97c006d70fb9bf43cdfba53c325e83378d1336f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A3=D1=85=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=90=D0=BD=D1=82?= =?UTF-8?q?=D0=BE=D0=BD?= Date: Thu, 22 Oct 2020 11:45:11 +0300 Subject: [PATCH 05/10] Changed build type to Debug --- .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 a4c80b1c2bd..88debeac0e6 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -27,4 +27,4 @@ jobs: run: ./configure.sh - name: Build with Gradle - run: cd android && ./gradlew aWR + run: cd android && ./gradlew aWD From b9448117e3578ce157ac9624bcba6c037353af1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A3=D1=85=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=90=D0=BD=D1=82?= =?UTF-8?q?=D0=BE=D0=BD?= Date: Thu, 22 Oct 2020 12:20:39 +0300 Subject: [PATCH 06/10] write fake params to google-services.json --- .github/workflows/android.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 88debeac0e6..5af7094ede7 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -22,9 +22,21 @@ jobs: - name: Update Submodules run: git submodule update --init --recursive - + - name: Configure run: ./configure.sh - + - name: Fill fake params + run: | + cat << EOF > android/google-services.json + { + "project_info": { + "project_number": "xxxx", + "firebase_url": "xxxx", + "project_id": "xxxx, + "storage_bucket": "xxxx" + }, + "client": [] + } + EOF - name: Build with Gradle run: cd android && ./gradlew aWD From 5a231b2a62b6c1d4d389cfc7056531e1919ee34a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A3=D1=85=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=90=D0=BD=D1=82?= =?UTF-8?q?=D0=BE=D0=BD?= Date: Thu, 22 Oct 2020 12:41:35 +0300 Subject: [PATCH 07/10] qoutes fix --- .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 5af7094ede7..c789f634476 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -32,7 +32,7 @@ jobs: "project_info": { "project_number": "xxxx", "firebase_url": "xxxx", - "project_id": "xxxx, + "project_id": "xxxx", "storage_bucket": "xxxx" }, "client": [] From f5f70a0cceee8dbf4893ba2add7789f9e3e0837d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A3=D1=85=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=90=D0=BD=D1=82?= =?UTF-8?q?=D0=BE=D0=BD?= Date: Thu, 22 Oct 2020 12:59:44 +0300 Subject: [PATCH 08/10] added fake client section --- .github/workflows/android.yml | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index c789f634476..2ef339d3d9e 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -35,8 +35,39 @@ jobs: "project_id": "xxxx", "storage_bucket": "xxxx" }, - "client": [] + "client": [ + { + "client_info": { + "mobilesdk_app_id": "xxxx", + "android_client_info": { + "package_name": "com.mapswithme.maps.pro.beta" + } + }, + "oauth_client": [ + { + "client_id": "xxxx", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "xxxx" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "xxxx", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" } EOF - name: Build with Gradle - run: cd android && ./gradlew aWD + run: cd android && ./gradlew assembleWebBeta From 5acf6b19f6361f25f98e4fa71b1a5adbd2ae0489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A3=D1=85=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=90=D0=BD=D1=82?= =?UTF-8?q?=D0=BE=D0=BD?= Date: Thu, 22 Oct 2020 14:28:13 +0300 Subject: [PATCH 09/10] added citymobil token --- .github/workflows/android.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 2ef339d3d9e..726e08781ea 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -69,5 +69,7 @@ jobs: "configuration_version": "1" } EOF + - name: Add CITYMOBIL_TOKEN var + run: echo '#define CITYMOBIL_TOKEN ""' >> private_default.h - name: Build with Gradle run: cd android && ./gradlew assembleWebBeta From 7e8b9e7018466b8a95b4fb4f23469e53a3334994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A3=D1=85=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=90=D0=BD=D1=82?= =?UTF-8?q?=D0=BE=D0=BD?= Date: Thu, 22 Oct 2020 17:19:34 +0300 Subject: [PATCH 10/10] Set build only arm64 platform --- .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 726e08781ea..7d3cdb0bd8e 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -72,4 +72,4 @@ jobs: - name: Add CITYMOBIL_TOKEN var run: echo '#define CITYMOBIL_TOKEN ""' >> private_default.h - name: Build with Gradle - run: cd android && ./gradlew assembleWebBeta + run: cd android && ./gradlew assembleWebBeta -Parm64