diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 766da6f..e96d8d6 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -34,16 +34,11 @@ jobs: java-version: '17' distribution: 'temurin' - - name: Set gradlew as executable - # for some reason the gradle-build-action doesn't do this automatically - run: chmod +x ./gradlew + - name: Setup gradle + uses: gradle/actions/setup-gradle@v4 - - name: Build & assemble with gradle - uses: gradle/gradle-build-action@v3 - with: - arguments: > - build - assemble${{ env.VARIANT }} + - name: Build & assemble + run: ./gradlew build assemble${{ env.VARIANT }} - name: Zip ${{ env.VARIANT }} apk as ${{ env.ZIP }} # just remove the password here if you want to build the apk yourself instead of sponsoring me and getting it as a benefit :( diff --git a/.github/workflows/validate-gradle-build-test.yml b/.github/workflows/validate-gradle-build-test.yml index 52f1ced..89285b3 100644 --- a/.github/workflows/validate-gradle-build-test.yml +++ b/.github/workflows/validate-gradle-build-test.yml @@ -34,28 +34,17 @@ jobs: java-version: '17' distribution: 'temurin' - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v3 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 - - name: Change wrapper permissions - # for some reason the gradle-build-action doesn't do this automatically - run: chmod +x ./gradlew - - - name: Build & test with Gradle - uses: gradle/gradle-build-action@v3 - with: - arguments: > - build - test + - name: Build & test + run: ./gradlew build test # the following steps will only run for PRs - name: "[PR] Generate apk" if: ${{ github.event_name == 'pull_request_target' }} - uses: gradle/gradle-build-action@v3 - with: - arguments: > - assemble${{ env.VARIANT }} + run: ./gradlew assemble${{ env.VARIANT }} - name: "[PR] Upload apk as artifact" id: artifact-upload-step diff --git a/gradlew b/gradlew old mode 100644 new mode 100755