Skip to content

Commit

Permalink
chore(ci): base64 encoding adding a new line after 76 char (#2666) (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
MohamadJaara committed Feb 7, 2024
1 parent b25ae64 commit 96a99d7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/cherry-pick-rc-to-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ on:
env:

TARGET_BRANCH: develop
# SUBMODULE_NAME:
SUBMODULE_NAME: kalium

jobs:
cherry-pick:
Expand Down Expand Up @@ -93,7 +93,8 @@ jobs:
cd ..
git add ${{ env.SUBMODULE_NAME }}
git commit -m "Update submodule ${{ env.SUBMODULE_NAME }} to latest from ${{ env.TARGET_BRANCH }}"
echo "lastCommitMessage=$LAST_COMMIT_MESSAGE" >> $GITHUB_ENV
# Base64 encode the commit message to avoid issues with newlines and special characters
echo "lastCommitMessageBase64=$(echo "$LAST_COMMIT_MESSAGE" | base64 -w 0 )" >> $GITHUB_ENV
- name: Get Cherry-pick commit
id: get-cherry
Expand All @@ -102,7 +103,9 @@ jobs:
if [[ -n "${{ env.SUBMODULE_NAME }}" ]]; then
# If SUBMODULE_NAME is set
git reset --soft HEAD~2
git commit -m "${{ env.lastCommitMessage }}"
# Decode the base64-encoded string
LAST_COMMIT_MESSAGE=$(echo "${{ env.lastCommitMessageBase64 }}" | base64 --decode)
git commit -m "$LAST_COMMIT_MESSAGE"
fi
# Get the SHA of the current commit (either squashed or not based on the condition above)
Expand Down
2 changes: 1 addition & 1 deletion kalium
Submodule kalium updated 52 files
+2 βˆ’1 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/CommitBundleEventReceiver.kt
+2 βˆ’8 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationGroupRepository.kt
+4 βˆ’2 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepository.kt
+97 βˆ’164 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/event/Event.kt
+43 βˆ’181 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/event/EventMapper.kt
+10 βˆ’8 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/event/EventRepository.kt
+6 βˆ’1 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/Message.kt
+27 βˆ’13 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageMapper.kt
+0 βˆ’8 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/team/TeamRepository.kt
+1 βˆ’1 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/RenameConversationUseCase.kt
+0 βˆ’2 .../commonMain/kotlin/com/wire/kalium/logic/feature/conversation/guestroomlink/GenerateGuestRoomLinkUseCase.kt
+27 βˆ’21 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/incremental/EventGatherer.kt
+21 βˆ’19 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/incremental/EventProcessor.kt
+4 βˆ’3 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/ConversationEventReceiver.kt
+2 βˆ’1 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/EventReceiver.kt
+2 βˆ’1 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/FeatureConfigEventReceiver.kt
+2 βˆ’1 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/FederationEventReceiver.kt
+2 βˆ’1 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/TeamEventReceiver.kt
+6 βˆ’4 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/UserEventReceiver.kt
+2 βˆ’1 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/UserPropertiesEventReceiver.kt
+8 βˆ’6 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/NewMessageEventHandler.kt
+3 βˆ’3 logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/handler/legalhold/LegalHoldHandler.kt
+0 βˆ’8 logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/ConversationRepositoryTest.kt
+0 βˆ’2 logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepositoryTest.kt
+1 βˆ’1 logic/src/commonTest/kotlin/com/wire/kalium/logic/data/event/EventRepositoryTest.kt
+3 βˆ’0 logic/src/commonTest/kotlin/com/wire/kalium/logic/data/message/MessageMapperTest.kt
+23 βˆ’53 logic/src/commonTest/kotlin/com/wire/kalium/logic/framework/TestEvent.kt
+25 βˆ’24 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/incremental/EventGathererTest.kt
+13 βˆ’12 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/incremental/EventProcessorTest.kt
+9 βˆ’8 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/incremental/IncrementalSyncWorkerTest.kt
+18 βˆ’18 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/ConversationEventReceiverTest.kt
+41 βˆ’20 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/FeatureConfigEventReceiverTest.kt
+3 βˆ’6 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/FederationEventReceiverTest.kt
+1 βˆ’1 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/TeamEventReceiverTest.kt
+17 βˆ’17 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/UserEventReceiverTest.kt
+1 βˆ’1 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/UserPropertiesEventReceiverTest.kt
+0 βˆ’2 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/conversation/CodeDeletedHandlerTest.kt
+0 βˆ’2 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/conversation/CodeUpdateHandlerTest.kt
+0 βˆ’2 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/conversation/MLSWelcomeEventHandlerTest.kt
+0 βˆ’2 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/conversation/MemberLeaveEventHandlerTest.kt
+0 βˆ’2 ...c/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/conversation/NewConversationEventHandlerTest.kt
+12 βˆ’12 ...rc/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/NewMessageEventHandlerTest.kt
+0 βˆ’4 logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/handler/legalhold/LegalHoldHandlerTest.kt
+0 βˆ’4 .../src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/handler/legalhold/LegalHoldRequestHandlerTest.kt
+4 βˆ’0 persistence/src/commonMain/db_user/com/wire/kalium/persistence/MessageDetailsView.sq
+165 βˆ’0 persistence/src/commonMain/db_user/migrations/74.sqm
+4 βˆ’0 persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageEntity.kt
+35 βˆ’4 persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageMapper.kt
+6 βˆ’3 persistence/src/commonTest/kotlin/com/wire/kalium/persistence/backup/DatabaseExporterTest.kt
+29 βˆ’14 persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageDAOTest.kt
+9 βˆ’0 persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageMapperTest.kt
+3 βˆ’0 persistence/src/commonTest/kotlin/com/wire/kalium/persistence/utils/stubs/MessageStubs.kt

0 comments on commit 96a99d7

Please sign in to comment.