From 880de21596c296085e18ba96d4ec0ddf88db9b04 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 27 Dec 2020 04:02:20 -0800
Subject: [PATCH] Update Github Actions

Disable gradle daemon on Windows and always upload artifacts
---
 .github/workflows/build.yml | 3 ++-
 gradle.properties           | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ea593f0eb..92e53b3db 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,6 +43,7 @@ jobs:
           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
+          echo "GRADLE_OPTS=-Dorg.gradle.daemon=false" >> $env:GITHUB_ENV
 
       - name: Set up GitHub env (Unix)
         if: runner.os != 'Windows'
@@ -79,7 +80,7 @@ jobs:
 
       # Only upload artifacts built on Linux
       - name: Upload build artifact
-        if: runner.os == 'Linux' && github.event_name != 'pull_request'
+        if: runner.os == 'Linux'
         uses: actions/upload-artifact@v2
         with:
           name: ${{ github.sha }}
diff --git a/gradle.properties b/gradle.properties
index 0a3499246..092a707ad 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,10 +17,6 @@ org.gradle.jvmargs=-Xmx2560m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
 
-# When set to true the Gradle daemon is used to run the build. For local developer builds this is our favorite property.
-# The developer environment is optimized for speed and feedback so we nearly always run Gradle jobs with the daemon.
-org.gradle.daemon=true
-
 # Android
 android.useAndroidX=true
 android.enableJetifier=false