-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into fix/failed-image-messages-not-visible-che…
…rry-pick
- Loading branch information
Showing
93 changed files
with
2,051 additions
and
244 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
app/src/internalDebug/screenshotTests/** filter=lfs diff=lfs merge=lfs -text |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,107 @@ | ||
name: "Generate and Verify Screenshot Tests" | ||
|
||
on: | ||
workflow_dispatch: | ||
|
||
permissions: | ||
contents: write | ||
pull-requests: write | ||
|
||
env: | ||
GITHUB_TOKEN: ${{ secrets.ANDROID_BOB_GH_TOKEN }} | ||
|
||
jobs: | ||
generate-screenshots: | ||
runs-on: buildjet-8vcpu-ubuntu-2204 | ||
|
||
if: github.ref == 'refs/heads/develop' | ||
|
||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
with: | ||
submodules: recursive | ||
fetch-depth: 0 | ||
|
||
- name: Set up JDK 17 | ||
uses: buildjet/setup-java@v4 | ||
with: | ||
java-version: '17' | ||
distribution: 'temurin' | ||
cache: gradle | ||
|
||
- name: Validate Gradle wrapper | ||
uses: gradle/actions/wrapper-validation@v4 | ||
|
||
- name: Install Git LFS | ||
run: | | ||
git lfs install | ||
git lfs fetch --all | ||
git lfs checkout | ||
- name: Merge Develop into screenshot-tests | ||
run: | | ||
git checkout screenshot-tests | ||
git merge origin/develop --no-edit | ||
git push origin screenshot-tests | ||
- name: Verify Screenshot Tests | ||
run: ./gradlew validateInternalDebugScreenshotTest | ||
continue-on-error: true # Ensure this task doesn't fail the build | ||
|
||
- name: Copy test results to simplified directory | ||
run: | | ||
mkdir -p screenshotTest | ||
cp -r app/build/reports/screenshotTest/preview/debug/internal/* screenshotTest/ | ||
- name: Zip Screenshot Test Reports | ||
run: | | ||
zip -r screenshot-test-report.zip screenshotTest/ | ||
- name: Upload Screenshot Test Report | ||
id: upload_artifact | ||
uses: actions/upload-artifact@v4 | ||
with: | ||
name: screenshot-test-report | ||
path: screenshot-test-report.zip | ||
|
||
- name: Clear changes before generating new screenshots | ||
run: | | ||
git reset --hard HEAD | ||
git clean -fd | ||
- name: Update Screenshot Reference Images | ||
run: ./gradlew updateInternalDebugScreenshotTest | ||
|
||
- name: Setup GitHub Actions Bot for Git | ||
uses: fregante/setup-git-user@v2 | ||
|
||
- name: Create New Branch | ||
id: create_branch | ||
run: | | ||
BRANCH_NAME="test/screenshots-update-$(date +%Y%m%d%H%M%S)" | ||
echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV | ||
git checkout -b "$BRANCH_NAME" | ||
git add . | ||
git commit -m "test: update screenshot tests" | ||
git push origin "$BRANCH_NAME" | ||
- name: Create PR | ||
env: | ||
PR_TITLE: "test: Update Screenshot Tests [WPB-983]" | ||
PR_BODY: "Automated PR to update screenshot tests with the latest reference images." | ||
PR_BRANCH: ${{ env.BRANCH_NAME }} | ||
run: | | ||
gh pr create --title "$PR_TITLE" --body "$PR_BODY" --base screenshot-tests --head "$PR_BRANCH" --label "screenshot-test" | ||
PR_NUMBER=$(gh pr view --json number -q .number) | ||
echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV | ||
- name: Add comment with test report link | ||
run: | | ||
ARTIFACT_ID=${{ steps.upload_artifact.outputs.artifact-id }} | ||
gh issue comment "${{ env.PR_NUMBER }}" --body "Screenshot test results have been generated. [Download the report](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts/$ARTIFACT_ID)" | ||
- name: Cleanup Gradle Cache | ||
run: | | ||
rm -f ~/.gradle/caches/modules-2/modules-2.lock | ||
rm -f ~/.gradle/caches/modules-2/gc.properties |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -100,8 +100,8 @@ object ReportBugDestination : IntentDirection { | |
val dir = LogFileWriter.logsDirectory(context) | ||
val logsUris = context.getUrisOfFilesInDirectory(dir) | ||
val intent = context.multipleFileSharingIntent(logsUris) | ||
intent.putExtra(Intent.EXTRA_EMAIL, arrayOf("[email protected]")) | ||
intent.putExtra(Intent.EXTRA_SUBJECT, "Bug Report - Wire Beta") | ||
intent.putExtra(Intent.EXTRA_EMAIL, arrayOf(context.getString(R.string.send_bug_report_email))) | ||
intent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.send_bug_report_subject)) | ||
intent.putExtra( | ||
Intent.EXTRA_TEXT, | ||
EmailComposer.reportBugEmailTemplate( | ||
|
46 changes: 46 additions & 0 deletions
46
app/src/main/kotlin/com/wire/android/navigation/TeamMigrationDestination.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
/* | ||
* Wire | ||
* Copyright (C) 2024 Wire Swiss GmbH | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation, either version 3 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program. If not, see http://www.gnu.org/licenses/. | ||
*/ | ||
package com.wire.android.navigation | ||
|
||
import com.ramcosta.composedestinations.spec.Direction | ||
import com.wire.android.ui.destinations.TeamMigrationConfirmationStepScreenDestination | ||
import com.wire.android.ui.destinations.TeamMigrationDoneStepScreenDestination | ||
|
||
sealed class TeamMigrationDestination( | ||
val direction: Direction | ||
) { | ||
|
||
data object Confirmation : TeamMigrationDestination( | ||
direction = TeamMigrationConfirmationStepScreenDestination | ||
) | ||
|
||
data object MigrationDone : TeamMigrationDestination( | ||
direction = TeamMigrationDoneStepScreenDestination | ||
) | ||
|
||
val itemName: String get() = ITEM_NAME_PREFIX + this | ||
|
||
companion object { | ||
private const val ITEM_NAME_PREFIX = "TeamMigrationNavigationItem." | ||
fun fromRoute(fullRoute: String): TeamMigrationDestination? = | ||
values().find { it.direction.route.getBaseRoute() == fullRoute.getBaseRoute() } | ||
|
||
fun values(): Array<TeamMigrationDestination> = | ||
arrayOf(Confirmation, MigrationDone) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.