diff --git a/.github/ci-gradle.properties b/.github/ci-gradle.properties index 9ba9603f3..089f2a675 100644 --- a/.github/ci-gradle.properties +++ b/.github/ci-gradle.properties @@ -16,7 +16,6 @@ org.gradle.daemon=false org.gradle.parallel=true -org.gradle.jvmargs=-Xmx5120m org.gradle.workers.max=2 kotlin.incremental=false diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index 801c1d32c..e3e8768b3 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -29,16 +29,8 @@ jobs: with: java-version: 11 - - name: Generate cache key - run: ./scripts/checksum.sh checksum.txt - - - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches/modules-* - ~/.gradle/caches/jars-* - ~/.gradle/caches/build-cache-* - key: gradle-${{ hashFiles('checksum.txt') }} + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 - name: Check spotless run: ./gradlew spotlessCheck --stacktrace @@ -52,31 +44,18 @@ jobs: - name: Run local tests run: ./gradlew testDemoDebug testProdDebug --stacktrace - - name: Upload Demo build outputs (APKs) - uses: actions/upload-artifact@v3 - with: - name: build-outputs-demo - path: app/demo/build/outputs - - - name: Upload Prod build outputs (APKs) + - name: Upload build outputs (APKs) uses: actions/upload-artifact@v3 with: - name: build-outputs-prod - path: app/prod/build/outputs + name: build-outputs + path: app/build/outputs - - name: Upload Demo build reports + - name: Upload build reports if: always() uses: actions/upload-artifact@v3 with: - name: build-reports-demo - path: app/demo/build/reports - - - name: Upload Prod build reports - if: always() - uses: actions/upload-artifact@v3 - with: - name: build-reports-prod - path: app/prod/build/reports + name: build-reports + path: app/build/reports androidTest: needs: build @@ -98,16 +77,8 @@ jobs: with: java-version: 11 - - name: Generate cache key - run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt - - - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches/modules-* - ~/.gradle/caches/jars-* - ~/.gradle/caches/build-cache-* - key: gradle-${{ hashFiles('checksum.txt') }} + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 - name: Run instrumentation tests uses: reactivecircus/android-emulator-runner@v2 diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 6283809a4..c887ea411 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -25,8 +25,8 @@ jobs: with: java-version: 11 - - name: Build all projects - run: ./scripts/gradlew_recursive.sh assembleDebug + - name: Build app + run: ./gradlew :app:assembleDemoRelease - name: Create Release id: create_release @@ -39,72 +39,12 @@ jobs: draft: true prerelease: false - - name: Upload Crane + - name: Upload app 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_path: app/build/outputs/apk/demo/release/app-demo-release.apk + asset_name: app-demo-release.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 diff --git a/scripts/checksum.sh b/scripts/checksum.sh deleted file mode 100755 index 438f9e90e..000000000 --- a/scripts/checksum.sh +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright 2022 Google, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#!/bin/bash -RESULT_FILE=$1 - -if [ -f $RESULT_FILE ]; then - rm $RESULT_FILE -fi -touch $RESULT_FILE - -checksum_file() { - echo $(openssl md5 $1 | awk '{print $2}') -} - -FILES=() -while read -r -d ''; do - FILES+=("$REPLY") -done < <(find . -type f \( -name "build.gradle*" -o -name "gradle-wrapper.properties" -o -name "robolectric.properties" \) -print0) - -# Loop through files and append MD5 to result file -for FILE in ${FILES[@]}; do - echo $(checksum_file $FILE) >> $RESULT_FILE -done -# Now sort the file so that it is idempotent -sort $RESULT_FILE -o $RESULT_FILE