Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Stuck on Setting up Wire after canceling E2EI during login [WPB-10046] 🍒 #2883

Closed
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
ede100f
fix: remove duplicate execution of avsSyncStateReporter (#2723)
alexandreferris Apr 29, 2024
f865752
ci: use new cherry-pick action on release cycle 4.6 [WPB-8770] 🍒 (#2728)
github-actions[bot] Apr 29, 2024
b06a4b6
chore: bump avs version to 9.7.12 (#2731)
ohassine May 2, 2024
84e7522
feat: support new MLS cipher suite [WPB-8592] 🍒 (#2732)
github-actions[bot] May 10, 2024
4bec9d1
chore: add jira linking for documentation puposes (#2755)
yamilmedina May 13, 2024
fd90a9b
chore: update AVS lib to 9.7.15 (#2762)
alexandreferris May 14, 2024
4184893
fix: No SystemMessage on new 1o1 conversation [WPB-8608] 🍒 (#2759)
github-actions[bot] May 15, 2024
8c6ee23
fix: wrong failType for MLS federation errors [WPB-9087] (#2757)
saleniuk May 15, 2024
dbc6e8f
fix: recreate cache directories in case cache is cleared [WPB-7368] (…
saleniuk May 17, 2024
134ac7d
fix: crash loop when logout/login while there is an MLS call ongoing …
github-actions[bot] May 18, 2024
d2169c1
feat: pass the MLS public key signature algorithm when updating MLS p…
github-actions[bot] May 21, 2024
14e2943
chore: update CC to rc.56.hotfix.2 [WPB-8592] 🍒 (#2743)
github-actions[bot] May 21, 2024
f8c4a14
feat: fetch MLS config when not available locally [WPB-8592] 🍒 (#2744)
github-actions[bot] May 21, 2024
c6a9c30
feat: set the correct external sender key when creating MLS conversat…
github-actions[bot] May 21, 2024
d9132de
feat: set the correct cipher suite when claiming key packages [WPB-85…
github-actions[bot] May 22, 2024
dcd806b
fix: Group calling not working when MLS is enabled (#2764) (#2765)
github-actions[bot] May 22, 2024
c9ae87a
fix(e2ei): expose thumbprint and userhandle with e2ei cert (WPB-8606)…
github-actions[bot] May 23, 2024
13cc534
fix(mls): set correct CipherSuite when establishing new created group…
github-actions[bot] May 24, 2024
0cdf629
fix(e2ei): crash on downloading certificates (WPB-9097) 🍒 (#2761)
github-actions[bot] May 24, 2024
1305d57
fix(mls): respect default protocol in one-on-one conversation initial…
github-actions[bot] May 24, 2024
4141635
fix(mls): update migrated conversation with correct group id and ciph…
github-actions[bot] May 27, 2024
a9e1741
chore: delete unused libsodium bindings (#2791)
MohamadJaara Jun 3, 2024
a56af40
chore: delete unused WireCryptobox binaries (#2792)
MohamadJaara Jun 3, 2024
e653caf
chore: delete zip dummy file from test resources (#2793)
MohamadJaara Jun 5, 2024
6209de3
fix: Split NoCommonProtocol error (#2832) (#2834)
github-actions[bot] Jun 25, 2024
8b38a32
fix(mls-migration): set correct CS when Kalium start migration (WPB-9…
github-actions[bot] Jun 26, 2024
4531d3f
feat: CRL proxy [WPB-8793] 🍒 (#2802)
github-actions[bot] Jun 27, 2024
e176d92
fix: Wrong E2EI information for other users [WPB-9409] 🍒 (#2835)
github-actions[bot] Jul 2, 2024
1a214ef
fix(mls-migration): allow skipping users without KeyPackages during M…
github-actions[bot] Jul 2, 2024
9f768b0
fix: is user speaking mapper causes a flash briefly (#2809) (#2855) (…
github-actions[bot] Jul 2, 2024
19b105f
fix: asset restriction [WPB-9947] (#2831) (#2856) 🍒 (#2862)
github-actions[bot] Jul 8, 2024
b3e0875
fix: Allow creating empty MLS GroupConversation [WPB-7099] 🍒 (#2870)
github-actions[bot] Jul 10, 2024
7756d06
feat: Add isReplyAllowed field to notification entity [WPB-7425] 🍒 (#…
github-actions[bot] Jul 11, 2024
a153e52
feat: Update isReplyAllowed in Notifications according LegalHoldStatu…
github-actions[bot] Jul 17, 2024
164f073
Commit with unresolved merge conflicts
borichellow Jul 17, 2024
1b5c41b
Fixed cherry-pick problems
borichellow Jul 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
50 changes: 50 additions & 0 deletions .github/workflows/cherry-pick-pr-to-newer-release-cycle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# GitHub Action: Cherry-pick from `release/candidate` to `TARGET_BRANCH`
#
# This action automates the process of cherry-picking merged PRs from `release/candidate` branch to `TARGET_BRANCH`.
# It is triggered whenever a pull request is merged into `release/candidate`.
#
# The action performs the following steps:
# 1. Checkout the merged PR.
# 2. If changes are made outside the specified submodule or no submodule is specified, the action proceeds.
# 3. If a submodule name is provided in the `SUBMODULE_NAME` environment variable:
# a. The action creates a temporary branch.
# b. Updates the submodule to its latest version from `develop`.
# c. Commits the submodule updates.
# 4. Squashes the commit with the commit message of the merged PR (if a submodule was updated).
# 5. Cherry-picks the squashed (or original if no squashing occurred) commit to a new branch based on `develop`.
# 6. If any conflicts arise during the cherry-pick, they are committed.
# 7. The branch with the cherry-picked changes is pushed.
# 8. A new pull request is created against `develop` with the cherry-picked changes.
#
# Note: Ensure you add a "cherry-pick" label to your project. This label is required for the creation of cherry-picked PRs.
# If needed, you can also set the `TARGET_BRANCH` environment variable to specify a different target branch for the cherry-pick.
# By default, it's set to `develop`.

name: "Cherry-pick from RC to develop"

on:
pull_request:
branches:
- release/candidate
types:
- closed

jobs:
cherry-pick:
runs-on: ubuntu-latest

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Cherry pick to `develop`
uses: wireapp/[email protected]
with:
target-branch: develop
pr-title-suffix: '🍒'
labels: 'cherry-pick'
158 changes: 0 additions & 158 deletions .github/workflows/cherry-pick-rc-to-develop.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .github/workflows/jira-lint-and-link.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Link and Lint PR with Jira Ticket Number
on:
merge_group:
pull_request:
types: [opened, edited, synchronize]
jobs:
add-jira-description:
runs-on: ubuntu-latest
# Run only if the PR is not from a Fork / external contributor
if: (!startsWith(github.ref, 'refs/heads/dependabot/') && github.repository_owner == 'wireapp')
steps:
- uses: cakeinpanic/[email protected]
name: jira-description-action
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
jira-token: ${{ secrets.JIRA_TOKEN }}
jira-base-url: https://wearezeta.atlassian.net
skip-branches: '^(production-release|main|master|release\/v\d+)$' #optional
fail-when-jira-issue-not-found: false
1 change: 0 additions & 1 deletion cryptography/Cartfile

This file was deleted.

3 changes: 0 additions & 3 deletions cryptography/Cartfile.resolved

This file was deleted.

19 changes: 0 additions & 19 deletions cryptography/Carthage/Build/.wire-ios-cryptobox.version

This file was deleted.

28 changes: 0 additions & 28 deletions cryptography/Carthage/Build/.wire-ios-system.version

This file was deleted.

28 changes: 0 additions & 28 deletions cryptography/Carthage/Build/.wire-ios-utilities.version

This file was deleted.

43 changes: 0 additions & 43 deletions cryptography/Carthage/Build/WireCryptobox.xcframework/Info.plist

This file was deleted.

Loading