From 09f5e3458e1857dcb596a1963f80cb67c4902a3b Mon Sep 17 00:00:00 2001
From: Nguyen Thai <tknguyen@linagora.com>
Date: Fri, 30 Sep 2022 10:55:16 +0700
Subject: [PATCH] Experiment with specific runner per OS

---
 .github/workflows/ci.yaml      | 14 ++++++++------
 .github/workflows/release.yaml | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 79a64c73d..88a086491 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -15,12 +15,14 @@ jobs:
     name: Build app
     needs:
       - analyze-test
-    runs-on: macos-latest
+    runs-on: ${{ matrix.runner }}
     strategy:
       matrix:
-        os:
-          - android
-          - ios
+        include:
+          - os: android
+            runner: ubuntu-latest
+          - os: ios
+            runner: macos-latest
     environment: dev
 
     steps:
@@ -44,8 +46,8 @@ jobs:
           PLAY_STORE_KEY_INFO_BASE64: ${{ secrets.PLAY_STORE_KEY_INFO_BASE64 }}
         run: |
           # echo "$GOOGLE_SERVICES_JSON" > app/google-services.json
-          echo "$PLAY_STORE_UPLOAD_KEY_BASE64" | base64 --decode --output app/keystore.jks
-          echo "$PLAY_STORE_KEY_INFO_BASE64" | base64 --decode --output key.properties
+          echo "$PLAY_STORE_UPLOAD_KEY_BASE64" | base64 --decode > app/keystore.jks
+          echo "$PLAY_STORE_KEY_INFO_BASE64" | base64 --decode > key.properties
         working-directory: ${{ matrix.os }}
 
       - name: Setup Java
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 69d6783e9..047a00c61 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -15,12 +15,14 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     needs:
       - analyze-test
-    runs-on: macos-latest
+    runs-on: ${{ matrix.runner }}
     strategy:
       matrix:
-        os:
-          - android
-          - ios
+        include:
+          - os: android
+            runner: ubuntu-latest
+          - os: ios
+            runner: macos-latest
     environment: prod
 
     steps:
@@ -42,8 +44,8 @@ jobs:
           PLAY_STORE_UPLOAD_KEY_BASE64: ${{ secrets.PLAY_STORE_UPLOAD_KEY_BASE64 }}
           PLAY_STORE_KEY_INFO_BASE64: ${{ secrets.PLAY_STORE_KEY_INFO_BASE64 }}
         run: |
-          echo "$PLAY_STORE_UPLOAD_KEY_BASE64" | base64 --decode --output app/keystore.jks
-          echo "$PLAY_STORE_KEY_INFO_BASE64" | base64 --decode --output key.properties
+          echo "$PLAY_STORE_UPLOAD_KEY_BASE64" | base64 --decode > app/keystore.jks
+          echo "$PLAY_STORE_KEY_INFO_BASE64" | base64 --decode > key.properties
         working-directory: ${{ matrix.os }}
 
       - name: Setup Java