Merge branch 'master' into release

monya-wallet · Aug 23, 2020 · feecac1 · feecac1
2 parents 63ca4c5 + eb1df58
commit feecac1
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -40,7 +40,7 @@ jobs:
                   cd ..
 
             - run: |
-                  sudo npm i -g cordova@7.1.0 electron-packager 
+                  sudo npm i -g cordova@7.1.0
                   wget https://services.gradle.org/distributions/gradle-4.1-bin.zip -qO gradle.zip
                   sudo unzip gradle.zip -d /opt
                   export PATH="$PATH:/opt/gradle-4.1/bin/"
@@ -88,10 +88,11 @@ jobs:
                   cd ..
 
             - run: |
-                  sudo npm i -g cordova@7.1.0 electron-packager 
+                  sudo npm i -g cordova@7.1.0
                   wget https://services.gradle.org/distributions/gradle-4.1-bin.zip -qO gradle.zip
                   sudo unzip gradle.zip -d /opt
                   export PATH="$PATH:/opt/gradle-4.1/bin/"
+                  sudo echo $ANDROID_SDK_LICENSE_VOLUMES > $ANDROID_HOME/licenses/android-sdk-license
                   sdkmanager tools "build-tools;28.0.3" "platform-tools" "platforms;android-28"
                   cd cordovaProj
                   npm i