From f5a75d17a124a01d1916bdb85e7a1a9da885827b Mon Sep 17 00:00:00 2001
From: Frieder Bluemle <frieder.bluemle@walmart.com>
Date: Tue, 8 Jun 2021 15:21:25 -0700
Subject: [PATCH] Update GitHub workflows

---
 .github/workflows/ci.yml            | 16 ++++++++++------
 .github/workflows/publish.yml       |  7 ++++---
 android/moviesreloaded/build.gradle |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b2b33740..8ec444c5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,16 +1,17 @@
 name: ci
 on:
   push:
-    branches: '*'
+    branches: ['*']
   pull_request:
 jobs:
   build-android:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
-          node-version: '12'
+          node-version: '16'
+      - run: echo "y" | /usr/local/lib/android/sdk/tools/bin/sdkmanager "ndk;21.0.6113669"
       - run: npm i -g electrode-native
       - run: yarn --frozen-lockfile
       - working-directory: android/
@@ -21,12 +22,15 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
-          node-version: '12'
+          node-version: '16'
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '12.4.0'
       - run: npm i -g electrode-native
       - run: yarn --frozen-lockfile
       - working-directory: ios/
-        run: ern create-container --out ${PWD}/container -m https://github.com/electrode-io/movies-reloaded-miniapp --platform ios
+        run: ern create-container -p ios --out ${PWD}/container -m https://github.com/electrode-io/movies-reloaded-miniapp
       - working-directory: ios/moviesreloadedMiniApp/
         run: xcodebuild -project "ErnRunner.xcodeproj" -scheme "ErnRunner" -destination "platform=iOS Simulator,name=iPhone 11"
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 794c06c2..bb7459c4 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,15 +1,16 @@
 name: publish
 on:
   push:
-    tags: v[0-9]+.[0-9]+.[0-9]+
+    tags: ['v[0-9]+.[0-9]+.[0-9]+']
 jobs:
   publish:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
-          node-version: 12
+          node-version: '16'
           registry-url: 'https://registry.npmjs.org'
       - run: yarn --frozen-lockfile
       - run: npm publish --access public
diff --git a/android/moviesreloaded/build.gradle b/android/moviesreloaded/build.gradle
index 711dca57..4d3bda99 100644
--- a/android/moviesreloaded/build.gradle
+++ b/android/moviesreloaded/build.gradle
@@ -26,7 +26,7 @@ android {
         targetCompatibility = '1.8'
     }
     buildToolsVersion = '28.0.3'
-
+    ndkVersion "21.0.6113669"
 }
 
 dependencies {