Update Github Actions

Disable gradle daemon on Windows and always upload artifacts
This commit is contained in:
topjohnwu 2020-12-27 04:02:20 -08:00
parent 622dd84c9e
commit 880de21596
2 changed files with 2 additions and 5 deletions

View File

@ -43,6 +43,7 @@ jobs:
echo "ANDROID_SDK_ROOT=$sdk_root" >> $env:GITHUB_ENV echo "ANDROID_SDK_ROOT=$sdk_root" >> $env:GITHUB_ENV
echo "ANDROID_HOME=$sdk_root" >> $env:GITHUB_ENV echo "ANDROID_HOME=$sdk_root" >> $env:GITHUB_ENV
echo "MAGISK_NDK_VERSION=$ndk_ver" >> $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) - name: Set up GitHub env (Unix)
if: runner.os != 'Windows' if: runner.os != 'Windows'
@ -79,7 +80,7 @@ jobs:
# Only upload artifacts built on Linux # Only upload artifacts built on Linux
- name: Upload build artifact - name: Upload build artifact
if: runner.os == 'Linux' && github.event_name != 'pull_request' if: runner.os == 'Linux'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: ${{ github.sha }} name: ${{ github.sha }}

View File

@ -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 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
org.gradle.parallel=true 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
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=false android.enableJetifier=false