From 91984f7c196cd701a5a4fa4984f7d4497b9b05ed Mon Sep 17 00:00:00 2001 From: VaiTon Date: Sat, 10 Apr 2021 18:03:19 +0200 Subject: [PATCH] build: updated build files (#3936) --- .github/workflows/android-feature.yml | 12 +++++ .github/workflows/android-integration.yml | 49 +++++++++++++------- .github/workflows/android-release-sentry.yml | 7 +-- .github/workflows/android-release.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/crowdin.yml | 4 +- .github/workflows/fastlane-supply-checks.yml | 18 ------- 7 files changed, 53 insertions(+), 41 deletions(-) delete mode 100644 .github/workflows/fastlane-supply-checks.yml diff --git a/.github/workflows/android-feature.yml b/.github/workflows/android-feature.yml index 40114e1d8891..57581082570f 100644 --- a/.github/workflows/android-feature.yml +++ b/.github/workflows/android-feature.yml @@ -12,6 +12,7 @@ jobs: test: name: Run Unit Tests runs-on: ubuntu-18.04 + steps: - name: Checkout sources uses: actions/checkout@v2 @@ -27,3 +28,14 @@ jobs: - name: Unit tests run: bash ./gradlew testObfPlaystoreDebugUnitTest testOffPlaystoreDebugUnitTest testOpfPlaystoreDebugUnitTest testOpffPlaystoreDebugUnitTest --stacktrace + + validate_metadata: + name: Validate Fastlane Metadata + runs-on: ubuntu-20.04 + + steps: + - name: Checkout source + uses: actions/checkout@v2 + + - name: Validate fastlane metadata + uses: ashutoshgngwr/validate-fastlane-supply-metadata@v1 \ No newline at end of file diff --git a/.github/workflows/android-integration.yml b/.github/workflows/android-integration.yml index fe185ffaa648..be8c6bdb501f 100644 --- a/.github/workflows/android-integration.yml +++ b/.github/workflows/android-integration.yml @@ -7,8 +7,8 @@ on: branches: [develop] jobs: - test: - name: Run Unit Tests + compile_screenshots: + name: Compile Screenshot Tests runs-on: ubuntu-20.04 steps: @@ -21,18 +21,32 @@ jobs: distribution: 'adopt' java-version: '11' - - name: Screenshots android tests + - name: Compile screenshots android tests uses: eskatos/gradle-command-action@v1 with: arguments: compileOffPlaystoreScreenshotsAndroidTestSources -PtestBuildType=screenshots - - name: Unit tests + test: + name: Unit Tests + runs-on: ubuntu-20.04 + + steps: + - name: Checkout sources + uses: actions/checkout@v2 + + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '11' + + - name: Run unit tests uses: eskatos/gradle-command-action@v1 with: arguments: testObfPlaystoreDebugUnitTest testOffPlaystoreDebugUnitTest testOpfPlaystoreDebugUnitTest testOpffPlaystoreDebugUnitTest - apk: - name: Generate APK + assemble_apk: + name: Assemble APKs runs-on: ubuntu-20.04 steps: @@ -45,10 +59,10 @@ jobs: distribution: 'adopt' java-version: '11' - - name: Workaround for Android Gradle plugin issue + - name: Workaround for Android Gradle Plugin issue run: "echo \"ndk.dir=${ANDROID_HOME}/ndk-bundle\" > local.properties" - - name: Build debug APKs + - name: Assemble debug APKs uses: eskatos/gradle-command-action@v1 with: arguments: assembleDebug --stacktrace @@ -78,26 +92,29 @@ jobs: path: app/build/outputs/apk/opff/debug/app-opff-debug.apk # lint: -# name: Android Lint +# name: Lint # runs-on: ubuntu-20.04 # # steps: # - name: Checkout sources # uses: actions/checkout@v2 # -# - name: Set up JDK 1.8 +# - name: Set up JDK 11 # uses: actions/setup-java@v2 # with: -# java-version: 1.8 +# distribution: 'adopt' +# java-version: '11' # -# - name: Workaround for Android Gradle plugin issue +# - name: Workaround for Android Gradle Plugin issue # run: "echo \"ndk.dir=${ANDROID_HOME}/ndk-bundle\" > local.properties" # -# - name: Increase memory limit for Gradle -# run: "export GRADLE_OPTS=\"-Xmx4G\"" +# - name: Increase gradle daemon memory +# run: "echo \"org.gradle.jvmargs=-Xmx4096m\" > gradle.properties" # -# - name: Run gradle android lint -# run: ./gradlew lint +# - name: Lint sources +# uses: eskatos/gradle-command-action@v1 +# with: +# arguments: lint --stacktrace # # - name: Generate GitHub annotations # uses: yutailang0119/action-android-lint@v1.0.2 diff --git a/.github/workflows/android-release-sentry.yml b/.github/workflows/android-release-sentry.yml index 678a19278ba8..766d8cc93f7c 100644 --- a/.github/workflows/android-release-sentry.yml +++ b/.github/workflows/android-release-sentry.yml @@ -8,6 +8,7 @@ jobs: finalize-sentry-release: name: Finalize Sentry release runs-on: ubuntu-20.04 + steps: - name: Checkout sources uses: actions/checkout@v2 @@ -24,12 +25,12 @@ jobs: ruby-version: 2.6.x - name: Install sentry-cli - run: curl -sL https://sentry.io/get-cli/ | bash + run: "curl -sL https://sentry.io/get-cli/ | bash" - - name: Install Dependencies + - name: Install dependencies via bundle run: gem install bundler && bundle install - - name: Run Fastlane finalize_sentry lane + - name: Run fastlane finalize_sentry lane run: bundle exec fastlane finalize_sentry env: SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index 5bc23ea9cbeb..57e346683ef2 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -102,7 +102,7 @@ jobs: distribution: 'adopt' java-version: '11' - - name: Workaround for Android Gradle plugin issue + - name: Workaround for Android Gradle Plugin issue run: "echo \"ndk.dir=${ANDROID_HOME}/ndk-bundle\" > local.properties" - name: Set up Ruby 2.6 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fc5a96bc4c98..92a15872303c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -39,7 +39,7 @@ jobs: distribution: 'adopt' java-version: '11' - - name: Workaround for Android Gradle plugin issue + - name: Workaround for Android Gradle Plugin issue run: "echo \"ndk.dir=${ANDROID_HOME}/ndk-bundle\" > local.properties" - name: Build debug APKs diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index c5c94da45e96..267963d58280 100644 --- a/.github/workflows/crowdin.yml +++ b/.github/workflows/crowdin.yml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout + - name: Checkout sources uses: actions/checkout@v2 - - name: crowdin action + - name: Sync translations with Crowdin uses: crowdin/github-action@1.1.0 with: upload_translations: true # default is false diff --git a/.github/workflows/fastlane-supply-checks.yml b/.github/workflows/fastlane-supply-checks.yml deleted file mode 100644 index ae9523f28e62..000000000000 --- a/.github/workflows/fastlane-supply-checks.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Fastlane Supply checks - -on: - push: - branches: - - '*' - - '!develop' - - '!master' - - '!release/*' -jobs: - checks: - runs-on: ubuntu-18.04 - steps: - - name: Checkout source - uses: actions/checkout@v1 - - - name: Checks - uses: ashutoshgngwr/validate-fastlane-supply-metadata@v1 \ No newline at end of file