Merge pull request #25 from paulnagle/build_script

build script
paulnagle · Nov 19, 2022 · 7f94d92 · 7f94d92
2 parents 452c1c2 + 48fed18
commit 7f94d92
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/build-debug-android.yaml b/.github/workflows/build-debug-android.yaml
@@ -11,20 +11,21 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'temurin'
+          java-version: '11'
 
       - name: Setup Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: 16.x
 
       - name: Build for android
         run: ./build.sh -a
 
       - name: Upload dev APK
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: app-dev
           path: platforms/android/app/build/outputs/apk/debug/app-debug.apk

diff --git a/.github/workflows/build-release-android.yaml b/.github/workflows/build-release-android.yaml
@@ -13,12 +13,13 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'temurin'
+          java-version: '11'
 
       - name: Setup Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: 16.x
 

diff --git a/build.sh b/build.sh
@@ -51,7 +51,11 @@ setup_node_npm() {
 
 install_deps() {
     red_text "** Installing ionic cli"
-    npm update -g --save @ionic/cli @ionic/cordova-builders native-run cordova-res cordova 
+    if ! [ command -v ionic ]; then
+        npm install -g --save @ionic/cli @ionic/cordova-builders native-run cordova-res cordova 
+    else
+        npm update -g --save @ionic/cli @ionic/cordova-builders native-run cordova-res cordova 
+    fi
 
     red_text "** Installing other npm dependencies"
     npm update --save \