From ab78a81d1526ab2429be7e992f6d8248e6afe115 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 25 Dec 2020 15:54:47 -0800
Subject: [PATCH] Fix GitHub actions

---
 .github/workflows/build.yml | 17 +++++++++++------
 build.py                    | 14 +++++++++++---
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 16ff00433..ea593f0eb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,12 +39,17 @@ jobs:
           $oldAndroidPath = $env:ANDROID_SDK_ROOT
           $sdk_root = "C:\Android"
           New-Item -Path $sdk_root -ItemType SymbolicLink -Value $oldAndroidPath
+          $ndk_ver = Select-String -Path "gradle.properties" -Pattern "^magisk.fullNdkVersion=" | % { $_ -replace ".*=" }
           echo "ANDROID_SDK_ROOT=$sdk_root" >> $env:GITHUB_ENV
           echo "ANDROID_HOME=$sdk_root" >> $env:GITHUB_ENV
+          echo "MAGISK_NDK_VERSION=$ndk_ver" >> $env:GITHUB_ENV
 
       - name: Set up GitHub env (Unix)
         if: runner.os != 'Windows'
-        run: echo ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT >> $GITHUB_ENV
+        run: |
+          ndk_ver=$(sed -n 's/^magisk.fullNdkVersion=//p' gradle.properties)
+          echo ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT >> $GITHUB_ENV
+          echo MAGISK_NDK_VERSION=$ndk_ver >> $GITHUB_ENV
 
       - name: Cache Gradle
         uses: actions/cache@v2
@@ -60,22 +65,22 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.ANDROID_SDK_ROOT }}/ndk/magisk
-          key: ${{ runner.os }}-ndk-${{ hashFiles('gradle.properties') }}
+          key: ${{ runner.os }}-ndk-${{ env.MAGISK_NDK_VERSION }}
 
       - name: Set up NDK
         if: steps.ndk-cache.outputs.cache-hit != 'true'
-        run: python3 build.py ndk
+        run: python build.py ndk
 
       - name: Build release
-        run: python3 build.py -vr all
+        run: python build.py -vr all
 
       - name: Build debug
-        run: python3 build.py -v all
+        run: python build.py -v all
 
       # Only upload artifacts built on Linux
       - name: Upload build artifact
         if: runner.os == 'Linux' && github.event_name != 'pull_request'
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ github.sha }}-artifact
+          name: ${{ github.sha }}
           path: out
diff --git a/build.py b/build.py
index 2ccc6f22d..9e52c1a0c 100755
--- a/build.py
+++ b/build.py
@@ -4,18 +4,26 @@ import os
 import subprocess
 
 is_windows = os.name == 'nt'
-if is_windows:
+is_ci = 'CI' in os.environ and os.environ['CI'] == 'true'
+
+if not is_ci and is_windows:
     import colorama
     colorama.init()
 
 
 def error(str):
-    print('\n' + '\033[41m' + str + '\033[0m' + '\n')
+    if is_ci:
+        print(f'\n ! {str}\n')
+    else:
+        print(f'\n\033[41m{str}\033[0m\n')
     sys.exit(1)
 
 
 def header(str):
-    print('\n' + '\033[44m' + str + '\033[0m' + '\n')
+    if is_ci:
+        print(f'\n{str}\n')
+    else:
+        print(f'\n\033[44m{str}\033[0m\n')
 
 
 def vprint(str):