Skip to content

Commit

Permalink
Merge branch 'develop' into feature/ons/fix_unstable_prefixes
Browse files Browse the repository at this point in the history
* develop: (392 commits)
  Missing import of at-Ignore annotation.
  FTUE - Choose a display picture (#5323)
  Ignore ThreadMessagingTest as it seems to cause other integration tests to fail.
  Maybe the file is here?
  I give up for the weekend
  Frustration at artifact handling vs what's in docs.
  Update the top bar in a room (#5213)
  Tweak upload/download of codecov xml file
  Address review points from adam
  Remove unneeded code, retaining a comment for how to exclude certain projects
  Merge pull request #5405 from vector-im/cgizard/ISSUE-5402
  Remove the printing of file name to the log as it's doubling up information.
  Remove exclusions (for now).
  Fix typo in name of action
  giving avatar/display name error dialogs human readable error messages - reuses the ErrorDialog logic which translates exceptions to human readable strings
  Run codecoverage and pass to sonarqube upload for processing.
  Better codecov based on ouchadam's suggestion
  Correct name of environment variable
  Use environment variable that is tied to project property
  Merge pull request #4498 from vector-im/yostyle/fix_strandhogg
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
  • Loading branch information
onurays committed Mar 8, 2022
2 parents 0fbbac6 + bdc9bc0 commit 81374c9
Show file tree
Hide file tree
Showing 495 changed files with 10,643 additions and 34,273 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ jobs:
fail-fast: false
matrix:
target: [ Gplay, Fdroid ]
# Allow all jobs on develop. Just one per PR.
concurrency:
group: ${{ github.ref == 'refs/heads/develop' && format('integration-tests-develop-{0}-{1}', matrix.target, github.sha) || format('build-debug-{0}-{1}', matrix.target, github.ref) }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
Expand All @@ -43,6 +47,7 @@ jobs:
name: Build unsigned GPlay APKs
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/main'
# Only runs on main, no concurrency.
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ jobs:
validation:
name: "Validation"
runs-on: ubuntu-latest
# No concurrency required, this is a prerequisite to other actions and should run every time.
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
210 changes: 0 additions & 210 deletions .github/workflows/integration_tests.yml

This file was deleted.

Loading

0 comments on commit 81374c9

Please sign in to comment.