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

2.3.2 #2651

Draft
wants to merge 28 commits into
base: develop
Choose a base branch
from
Draft

2.3.2 #2651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .github/secrets/Certificates.p12.gpg
Binary file not shown.
3 changes: 1 addition & 2 deletions .github/secrets/decrypt_secrets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ gpg --quiet --batch --yes --decrypt --passphrase="$IOS_CERTIFICATE_KEY" --output

mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles

cp ./.github/secrets/match_AppStore_comquietmobile.mobileprovision ~/Library/MobileDevice/Provisioning\ Profiles/718ac015-309f-49b6-9653-f6cf84a6377c.mobileprovision

cp ./.github/secrets/match_AppStore_comquietmobile.mobileprovision ~/Library/MobileDevice/Provisioning\ Profiles/762df280-302c-4336-a56d-c74914169337.mobileprovision

security create-keychain -p "" build.keychain
security import ./.github/secrets/Certificates.p12 -t agg -k ~/Library/Keychains/build.keychain -P "$IOS_CERTIFICATE_KEY" -A
Expand Down
Binary file modified .github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg
Binary file not shown.
2 changes: 1 addition & 1 deletion .github/workflows/backend-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04, macos-12, windows-2019]
os: [ubuntu-20.04, macos-13, windows-2019]

steps:
- uses: dorny/paths-filter@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/desktop-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:

build-macos:
# needs: run-e2e-tests-mac
runs-on: macos-12
runs-on: macos-13
if: |
startsWith(github.ref, 'refs/tags/@quiet/desktop')

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/desktop-rtl-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04, macos-12]
os: [ubuntu-20.04, macos-13]

steps:
- uses: dorny/paths-filter@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/desktop-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04, macos-12]
os: [ubuntu-20.04, macos-13]

steps:
- uses: dorny/paths-filter@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: workflow_dispatch
jobs:
detox-ios:
timeout-minutes: 25
runs-on: [macos-latest-xlarge]
runs-on: [macos-13-xlarge]

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: E2E Mac
on: [workflow_call]
jobs:
mac:
runs-on: macos-12
runs-on: macos-13
timeout-minutes: 180
env:
TEST_MODE: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/identity-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04, macos-12, windows-2019]
os: [ubuntu-20.04, macos-13, windows-2019]

steps:
- uses: dorny/paths-filter@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04] #, macos-latest, windows-2019]
os: [ubuntu-20.04] #, macos-13, windows-2019]

steps:
- name: 'Print OS'
Expand Down
72 changes: 72 additions & 0 deletions .github/workflows/mobile-deploy-ios-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Test IOS build

on:
pull_request:

jobs:
test-build-ios:
# needs: detox-ios
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [macos-13]

steps:
- name: "Print OS"
run: echo ${{ matrix.os }}

- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
submodules: 'recursive'
lfs: true

- name: Install gpg
run: brew install gnupg

- name: Setup XCode
uses: maxim-lobanov/setup-xcode@9a697e2b393340c3cacd97468baa318e4c883d98 # v1.5.1
with:
xcode-version: '15.2'

- name: Setup environment
uses: ./.github/actions/setup-env
with:
cachePrefix: "deploy-ios"
bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/mobile,backend-bundle"

- name: Install pod dependencies
run: |
cd ./packages/mobile/ios
pod install
shell: bash

- name: Setup provisioning profile
run: ./.github/secrets/decrypt_secrets.sh
env:
IOS_PROFILE_KEY: ${{ secrets.IOS_PROFILE_KEY }}
IOS_CERTIFICATE_KEY: ${{ secrets.IOS_CERTIFICATE_KEY }}

- name: Build
run: |
cd ./packages/mobile/ios
xcodebuild archive \
-workspace Quiet.xcworkspace \
-scheme Quiet \
-configuration Release \
-archivePath build/Quiet.xcarchive \
PROVISIONING_PROFILE="762df280-302c-4336-a56d-c74914169337" \
CODE_SIGN_IDENTITY="Apple Distribution: A Quiet LLC (CTYKSWN9T4)"

- name: Export .ipa
run: |
cd ./packages/mobile/ios
xcodebuild \
-exportArchive \
-archivePath build/Quiet.xcarchive \
-exportOptionsPlist ci.plist \
-exportPath build/

- name: Cleanup environment
if: always()
run: security delete-keychain build.keychain && rm -f ~/Library/MobileDevice/Provisioning\ Profiles/*.mobileprovision
6 changes: 3 additions & 3 deletions .github/workflows/mobile-deploy-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

strategy:
matrix:
os: [macos-latest]
os: [macos-13]

steps:
- name: "Print OS"
Expand Down Expand Up @@ -59,8 +59,8 @@ jobs:
-scheme Quiet \
-configuration Release \
-archivePath build/Quiet.xcarchive \
PROVISIONING_PROFILE="718ac015-309f-49b6-9653-f6cf84a6377c" \
CODE_SIGN_IDENTITY="Apple Distribution: Zbay LLC (CTYKSWN9T4)"
PROVISIONING_PROFILE="762df280-302c-4336-a56d-c74914169337" \
CODE_SIGN_IDENTITY="Apple Distribution: A Quiet LLC (CTYKSWN9T4)"

- name: Export .ipa
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/state-manager-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04, macos-12]
os: [ubuntu-20.04, macos-13]

steps:
- uses: dorny/paths-filter@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/utils-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04, macos-12, windows-2019]
os: [ubuntu-20.04, macos-13, windows-2019]

steps:
- name: "Print OS"
Expand Down
2 changes: 1 addition & 1 deletion 3rd-party/auth
Submodule auth updated 0 files
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# Changelog

## [unreleased]
## [2.3.2]

### Chores
### Chores

* Moved some responsibilities of identity management to the backend ([#2617](https://github.com/TryQuiet/quiet/pull/2617))
* Moved some responsibilities of identity management to the backend ([#2602](https://github.com/TryQuiet/quiet/issues/2602))
* Added auth submodule in preparation for future encyrption work ([#2623](https://github.com/TryQuiet/quiet/issues/2623))

### Fixes

Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/nest/common/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export function generateRandomOnionAddress(length: number = 56): string {
let randomString = ''

const randomValues = new Uint32Array(length)
crypto.getRandomValues(randomValues)
crypto.webcrypto.getRandomValues(randomValues)

for (let i = 0; i < length; i++) {
randomString += charset[randomValues[i] % charsetLength]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,11 @@ describe('Connections manager', () => {
localDbService.setIdentity(userIdentity)

expect(connectionsManagerService.communityState).toBe(undefined)
// community will fail to launch from storage on init because factory community id
// will not match the one in the storage set in beforeEach

localDbService.setCommunity({ ...community, peerList: peerList })
localDbService.setCurrentCommunityId(community.id)
logger.info('Launching community', community.id, 'with peer list', peerList)
await connectionsManagerService.init()
await connectionsManagerService.launchCommunity({ ...community, peerList: peerList })
await sleep(5000)

expect(connectionsManagerService.communityState).toBe(ServiceState.LAUNCHED)
Expand Down Expand Up @@ -332,10 +333,9 @@ describe('Connections manager', () => {
localDbService.setIdentity(userIdentity)

expect(connectionsManagerService.communityState).toBe(undefined)
// community will fail to launch from storage on init because factory community id
// will not match the one in the storage set in beforeEach
localDbService.setCommunity({ ...community, peerList: peerList })
localDbService.setCurrentCommunityId(community.id)
await connectionsManagerService.init()
await connectionsManagerService.launchCommunity({ ...community, peerList: peerList })
await sleep(5000)

expect(connectionsManagerService.communityState).toBe(ServiceState.LAUNCHED)
Expand Down
1 change: 0 additions & 1 deletion packages/backend/src/nest/local-db/local-db.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ export class LocalDbService {

// temporarily shoving identity creation here
public async setIdentity(identity: Identity) {
await this.put(LocalDBKeys.IDENTITIES, identity)
let identities = await this.get(LocalDBKeys.IDENTITIES)
if (!identities) {
identities = {}
Expand Down
12 changes: 12 additions & 0 deletions packages/desktop/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## [2.3.2]

### Chores

* Moved some responsibilities of identity management to the backend ([#2602](https://github.com/TryQuiet/quiet/issues/2602))
* Added auth submodule in preparation for future encyrption work ([#2623](https://github.com/TryQuiet/quiet/issues/2623))

### Fixes

* Fixed memory leak associated with autoUpdater ([#2606](https://github.com/TryQuiet/quiet/issues/2606))
* Fixed visual regression tests ([#2644](https://github.com/TryQuiet/quiet/issues/2645))

## [2.3.1]

### Fixes
Expand Down
4 changes: 2 additions & 2 deletions packages/desktop/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
},
"homepage": "https://github.com/TryQuiet",
"@comment version": "To build new version for specific platform, just replace platform in version tag to one of following linux, mac, windows",
"version": "2.3.1",
"version": "2.3.2-alpha.6",
"description": "Decentralized team chat",
"main": "dist/main/main.js",
"scripts": {
Expand Down
12 changes: 12 additions & 0 deletions packages/mobile/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## [2.3.2]

### Chores

* Moved some responsibilities of identity management to the backend ([#2602](https://github.com/TryQuiet/quiet/issues/2602))
* Added auth submodule in preparation for future encyrption work ([#2623](https://github.com/TryQuiet/quiet/issues/2623))

### Fixes

* Fixed memory leak associated with autoUpdater ([#2606](https://github.com/TryQuiet/quiet/issues/2606))
* Fixed visual regression tests ([#2644](https://github.com/TryQuiet/quiet/issues/2645))

## [2.3.1]

### Fixes
Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ android {
applicationId "com.quietmobile"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 425
versionName "2.3.1"
versionCode 432
versionName "2.3.2-alpha.6"
resValue "string", "build_config_package", "com.quietmobile"
testBuildType System.getProperty('testBuildType', 'debug')
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/ios/Quiet/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.3.1</string>
<string>2.3.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -34,7 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>382</string>
<string>389</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false />
<key>LSRequiresIPhoneOS</key>
Expand Down
4 changes: 2 additions & 2 deletions packages/mobile/ios/QuietTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>2.3.1</string>
<string>2.3.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>382</string>
<string>389</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions packages/mobile/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/mobile/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@quiet/mobile",
"version": "2.3.1",
"version": "2.3.2-alpha.6",
"scripts": {
"build": "tsc -p tsconfig.build.json --noEmit",
"storybook-android": "ENVFILE=.env.storybook react-native run-android --mode=storybookDebug --appIdSuffix=storybook.debug",
Expand Down
Loading