From 2ae4b87f2f46499ad8b12cc71ce316e9ec5b2e9a Mon Sep 17 00:00:00 2001 From: valere Date: Fri, 2 Dec 2022 15:49:32 +0100 Subject: [PATCH] fix CI --- .github/workflows/elementr.yml | 2 +- .github/workflows/nightly_er.yml | 2 +- .../crypto/verification/self/SelfVerificationController.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/elementr.yml b/.github/workflows/elementr.yml index b539044f30..58dae870dc 100644 --- a/.github/workflows/elementr.yml +++ b/.github/workflows/elementr.yml @@ -21,7 +21,7 @@ jobs: 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) }} + group: ${{ github.ref == 'refs/heads/develop' && format('elementr-{0}-{1}', matrix.target, github.sha) || format('build-debug-{0}-{1}', matrix.target, github.ref) }} cancel-in-progress: true steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/nightly_er.yml b/.github/workflows/nightly_er.yml index dd6cead1f8..e9981ad06a 100644 --- a/.github/workflows/nightly_er.yml +++ b/.github/workflows/nightly_er.yml @@ -36,7 +36,7 @@ jobs: sed 's/CHANGES\.md/CHANGES_NIGHTLY\.md/' towncrier.toml.bak > towncrier.toml rm towncrier.toml.bak yes n | towncrier build --version nightly - - name: Build and upload Gplay Nightly APK + - name: Build and upload Gplay Nightly ER APK run: | ./gradlew assembleGplayRustCryptoNightly appDistributionUploadGplayRustCryptoNightly $CI_GRADLE_ARG_PROPERTIES env: diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt index 1a9763de1c..6c42481b5a 100644 --- a/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt @@ -290,7 +290,7 @@ class SelfVerificationController @Inject constructor( } is Success -> { // Success => There is an active transaction - renderTransaction(state, transaction = transaction.invoke()) + renderTransaction(transaction = transaction.invoke()) } is Fail -> { // todo @@ -300,7 +300,7 @@ class SelfVerificationController @Inject constructor( } } - private fun renderTransaction(state: SelfVerificationViewState, transaction: VerificationTransactionData) { + private fun renderTransaction(transaction: VerificationTransactionData) { when (transaction) { is VerificationTransactionData.QrTransactionData -> { renderQrTransaction(transaction, null)