From 274f0edd76fea148d392691f86bfa211dd8db7e2 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 20 Sep 2020 10:39:54 -0400 Subject: [PATCH] Perform build check on push, move Gradle wrapper validation into build action --- .../{pr_build_check.yml => build_check.yml} | 15 ++++++++++----- .github/workflows/gradle-wrapper-validation.yml | 11 ----------- 2 files changed, 10 insertions(+), 16 deletions(-) rename .github/workflows/{pr_build_check.yml => build_check.yml} (56%) delete mode 100644 .github/workflows/gradle-wrapper-validation.yml diff --git a/.github/workflows/pr_build_check.yml b/.github/workflows/build_check.yml similarity index 56% rename from .github/workflows/pr_build_check.yml rename to .github/workflows/build_check.yml index e7f1504071..8a47640f5c 100644 --- a/.github/workflows/pr_build_check.yml +++ b/.github/workflows/build_check.yml @@ -1,5 +1,5 @@ -name: Pull request build check -on: [pull_request] +name: Build check +on: [push, pull_request] jobs: build: @@ -8,11 +8,16 @@ jobs: steps: - name: Clone repo uses: actions/checkout@v2 + + - name: Validate Gradle Wrapper + uses: gradle/wrapper-validation-action@v1 + - name: Set up JDK 1.8 uses: actions/setup-java@v1 with: java-version: 1.8 - name: Install NDK - run: sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.0.6113669" - - name: Build project - run: ./gradlew assembleDebug + run: sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.0.6113669" &> /dev/null + + - name: Build app + run: ./gradlew assembleStandardDebug diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml deleted file mode 100644 index 2efc6f9739..0000000000 --- a/.github/workflows/gradle-wrapper-validation.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Validate Gradle Wrapper -on: [push, pull_request] - -jobs: - validation: - name: Validation - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - uses: gradle/wrapper-validation-action@v1