From c178162d40325ea39795bb06a1beedfc5136f3d4 Mon Sep 17 00:00:00 2001 From: Jolanda Verhoef Date: Mon, 6 Jun 2022 15:00:04 +0200 Subject: [PATCH] Run Gradle Wrapper validation as part of the build workflows. Remove unused Release workflow. Change-Id: Ifc9a7f3349fabc27fbb97f97e570a526aaca8feb --- .github/workflows/Build.yaml | 4 ++ .github/workflows/Release.yml | 107 ---------------------------------- 2 files changed, 4 insertions(+), 107 deletions(-) delete mode 100644 .github/workflows/Release.yml diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index eaf23e690..cb83aa90b 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -37,6 +37,8 @@ jobs: ~/.gradle/caches/build-cache-* key: gradle-${{ hashFiles('checksum.txt') }} + - uses: gradle/wrapper-validation-action@v1 + - name: Check spotless run: ./gradlew spotlessCheck --stacktrace @@ -96,6 +98,8 @@ jobs: ~/.gradle/caches/build-cache-* key: gradle-${{ hashFiles('checksum.txt') }} + - uses: gradle/wrapper-validation-action@v1 + - name: Run instrumentation tests uses: reactivecircus/android-emulator-runner@v2 with: diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml deleted file mode 100644 index fd5336526..000000000 --- a/.github/workflows/Release.yml +++ /dev/null @@ -1,107 +0,0 @@ -name: GitHub Release with APKs - -on: - push: - tags: - - 'v*' - -jobs: - build: - runs-on: ubuntu-latest - timeout-minutes: 45 - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Copy CI gradle.properties - run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - java-version: 11 - - - name: Build all projects - run: ./scripts/gradlew_recursive.sh assembleDebug - - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.ref }} - release_name: ${{ github.ref }} - draft: true - prerelease: false - - - name: Upload Crane - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: Crane/app/build/outputs/apk/debug/app-debug.apk - asset_name: crane-debug.apk - asset_content_type: application/vnd.android.package-archive - - - name: Upload Owl - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: Owl/app/build/outputs/apk/debug/app-debug.apk - asset_name: owl-debug.apk - asset_content_type: application/vnd.android.package-archive - - - name: Upload Jetcaster - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: Jetcaster/app/build/outputs/apk/debug/app-debug.apk - asset_name: jetcaster-debug.apk - asset_content_type: application/vnd.android.package-archive - - - name: Upload Jetchat - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: Jetchat/app/build/outputs/apk/debug/app-debug.apk - asset_name: jetchat-debug.apk - asset_content_type: application/vnd.android.package-archive - - - name: Upload Jetnews - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: JetNews/app/build/outputs/apk/debug/app-debug.apk - asset_name: jetnews-debug.apk - asset_content_type: application/vnd.android.package-archive - - - name: Upload Jetsnack - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: Jetsnack/app/build/outputs/apk/debug/app-debug.apk - asset_name: jetsnack-debug.apk - asset_content_type: application/vnd.android.package-archive - - - name: Upload Jetsurvey - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: Jetsurvey/app/build/outputs/apk/debug/app-debug.apk - asset_name: jetsurvey-debug.apk - asset_content_type: application/vnd.android.package-archive