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

Merge/mobile releasable to develop #1941

Merged
merged 27 commits into from
Oct 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d7ce064
Merge branch 'master' into mobile/releasable
siepra Oct 4, 2023
d152571
Mark packages private
siepra Sep 26, 2023
d964905
Add suffix to desktop package name
siepra Sep 26, 2023
6d8812f
Update desktop package-lock
siepra Sep 26, 2023
ae09ada
Don't trigger desktop e2e tests on mobile changes
siepra Oct 2, 2023
49a0b2c
Unify workflows naming
siepra Oct 2, 2023
b44f053
Enhance PR checklist with mobile specific checks
siepra Oct 2, 2023
8ee6666
Extract Desktop RTL tests
siepra Oct 3, 2023
5111b94
Change scope name in build actions
siepra Oct 3, 2023
ffe601f
Remove extra branches from lerna config
siepra Oct 3, 2023
8836260
Update setEnvs script
vinkabuki Oct 3, 2023
9cd14c9
Unblock mobile e2e tests
siepra Sep 29, 2023
cf704b4
Allow versioning from current branch
siepra Oct 4, 2023
2d01970
Publish
siepra Oct 4, 2023
a3f607d
Fix socket events queue
siepra Oct 4, 2023
2689938
Use better runner for Android build
siepra Oct 4, 2023
8c0a114
Publish
siepra Oct 4, 2023
49e87a2
Prevent running desktop e2e tests on wrong tag
siepra Oct 4, 2023
fe3e6d3
Add debug logs for deep link issue
siepra Oct 5, 2023
116c925
Publish
siepra Oct 5, 2023
a14fafb
Revert "Prevent running desktop e2e tests on wrong tag"
siepra Oct 5, 2023
ad96d8c
Prevent running desktop e2e tests on wrong tag
siepra Oct 9, 2023
94855a8
Ci/use self hosted runner (#1931)
siepra Oct 9, 2023
fbd0ea0
Fix/deeplinking (#1935)
siepra Oct 9, 2023
e634868
Publish
siepra Oct 9, 2023
06ab121
Merge branch 'develop' into merge/mobile-releasable-to-develop
siepra Oct 9, 2023
ef3e35a
Change project name occurencies in README
siepra Oct 9, 2023
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
9 changes: 9 additions & 0 deletions .github/workflows/desktop-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,20 @@ on:
[released, prereleased]

jobs:

run-e2e-tests-linux:
if: |
startsWith(github.ref, 'refs/tags/@quiet/desktop')
uses: ./.github/workflows/e2e-linux.yml

run-e2e-tests-mac:
if: |
startsWith(github.ref, 'refs/tags/@quiet/desktop')
uses: ./.github/workflows/e2e-mac.yml

run-e2e-tests-win:
if: |
startsWith(github.ref, 'refs/tags/@quiet/desktop')
uses: ./.github/workflows/e2e-win.yml

build-linux:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobile-deploy-android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04]
os: [ubuntu-latest-m]

steps:
- name: "Print OS"
Expand Down
25 changes: 20 additions & 5 deletions packages/backend-bundle/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,23 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline



## [2.0.1-alpha.1](https://github.com/ZbayApp/monorepo/compare/backend-bundle@2.0.1-alpha.0...backend-bundle@2.0.1-alpha.1) (2023-09-25)
## [2.0.1-alpha.1](https://github.com/TryQuiet/quiet/compare/backend-bundle@2.0.1-alpha.0...backend-bundle@2.0.1-alpha.1) (2023-09-25)

**Note:** Version bump only for package backend-bundle





## [2.0.1-alpha.0](https://github.com/ZbayApp/monorepo/compare/backend-bundle@1.7.0-alpha.0...backend-bundle@2.0.1-alpha.0) (2023-09-25)
## [2.0.1-alpha.0](https://github.com/TryQuiet/quiet/compare/backend-bundle@1.7.0-alpha.0...backend-bundle@2.0.1-alpha.0) (2023-09-25)

**Note:** Version bump only for package backend-bundle





# [2.0.0-alpha.18](https://github.com/TryQuiet/quiet/compare/backend-bundle@1.6.1...backend-bundle@2.0.0-alpha.18) (2023-10-04)

**Note:** Version bump only for package backend-bundle

Expand All @@ -28,6 +36,13 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline


# [1.7.0-alpha.0](/compare/backend-bundle@1.6.0...backend-bundle@1.7.0-alpha.0) (2023-08-29)

**Note:** Version bump only for package backend-bundle





## [1.6.1](https://github.com/TryQuiet/quiet/compare/backend-bundle@1.6.0...backend-bundle@1.6.1) (2023-09-25)

**Note:** Version bump only for package backend-bundle
Expand Down Expand Up @@ -60,7 +75,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline



# [1.4.0](https://github.com/ZbayApp/monorepo/compare/backend-bundle@1.4.0-alpha.1...backend-bundle@1.4.0) (2023-07-28)
# [1.4.0](https://github.com/TryQuiet/quiet/compare/backend-bundle@1.4.0-alpha.1...backend-bundle@1.4.0) (2023-07-28)

**Note:** Version bump only for package backend-bundle

Expand All @@ -76,7 +91,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline



# [1.4.0-alpha.0](https://github.com/ZbayApp/monorepo/compare/backend-bundle@1.3.1...backend-bundle@1.4.0-alpha.0) (2023-06-19)
# [1.4.0-alpha.0](https://github.com/TryQuiet/quiet/compare/backend-bundle@1.3.1...backend-bundle@1.4.0-alpha.0) (2023-06-19)

**Note:** Version bump only for package backend-bundle

Expand Down Expand Up @@ -252,7 +267,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline



# [0.19.0-alpha.1](https://github.com/ZbayApp/monorepo/compare/backend-bundle@0.19.0-alpha.0...backend-bundle@0.19.0-alpha.1) (2023-01-27)
# [0.19.0-alpha.1](https://github.com/TryQuiet/quiet/compare/backend-bundle@0.19.0-alpha.0...backend-bundle@0.19.0-alpha.1) (2023-01-27)

**Note:** Version bump only for package backend-bundle

Expand Down
59 changes: 55 additions & 4 deletions packages/backend/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline


## [2.0.1-alpha.1](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.1-alpha.0...@quiet/backend@2.0.1-alpha.1) (2023-09-25)
## [1.9.4](https://github.com/TryQuiet/backend/compare/@quiet/backend@1.9.3...@quiet/backend@1.9.4) (2023-10-03)

**Note:** Version bump only for package @quiet/backend

Expand All @@ -21,7 +20,30 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline


## [2.0.1-alpha.0](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.0-alpha.5...@quiet/backend@2.0.1-alpha.0) (2023-09-25)
## [1.9.3](https://github.com/TryQuiet/backend/compare/@quiet/backend@1.9.2...@quiet/backend@1.9.3) (2023-10-03)

**Note:** Version bump only for package @quiet/backend





# [2.0.0-alpha.20](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.0-alpha.19...@quiet/backend@2.0.0-alpha.20) (2023-10-09)

**Note:** Version bump only for package @quiet/backend





# [2.0.0-alpha.19](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.0-alpha.18...@quiet/backend@2.0.0-alpha.19) (2023-10-04)

**Note:** Version bump only for package @quiet/backend





# [2.0.0-alpha.18](https://github.com/TryQuiet/backend/compare/@quiet/backend@1.9.4...@quiet/backend@2.0.0-alpha.18) (2023-10-04)

**Note:** Version bump only for package @quiet/backend

Expand All @@ -30,7 +52,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline


# [2.0.0-alpha.5](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.0-alpha.4...@quiet/backend@2.0.0-alpha.5) (2023-09-19)
## [1.9.2](https://github.com/TryQuiet/backend/compare/@quiet/backend@1.9.1...@quiet/backend@1.9.2) (2023-09-25)

**Note:** Version bump only for package @quiet/backend

Expand Down Expand Up @@ -77,8 +98,38 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline




# [1.10.0-alpha.0](https://github.com/TryQuiet/backend/compare/@quiet/backend@1.9.0...@quiet/backend@1.10.0-alpha.0) (2023-08-29)

**Note:** Version bump only for package @quiet/backend





## [1.9.4](https://github.com/TryQuiet/backend/compare/@quiet/backend@1.9.3...@quiet/backend@1.9.4) (2023-10-03)

**Note:** Version bump only for package @quiet/backend





## [1.9.3](https://github.com/TryQuiet/backend/compare/@quiet/backend@1.9.2...@quiet/backend@1.9.3) (2023-10-03)

**Note:** Version bump only for package @quiet/backend





## [1.9.2](https://github.com/TryQuiet/backend/compare/@quiet/backend@1.9.1...@quiet/backend@1.9.2) (2023-09-25)

**Note:** Version bump only for package @quiet/backend





## [1.9.1](https://github.com/TryQuiet/backend/compare/@quiet/backend@1.9.0...@quiet/backend@1.9.1) (2023-09-15)

**Note:** Version bump only for package @quiet/backend
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ export class ConnectionsManagerService extends EventEmitter implements OnModuleI
this.serverIoProvider.io.close()
}

// This method is only used on iOS through rn-bridge for reacting on lifecycle changes
public async openSocket() {
await this.socketService.init()
}
Expand Down
10 changes: 6 additions & 4 deletions packages/backend/src/nest/socket/socket.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,22 @@ export class SocketService extends EventEmitter implements OnModuleInit {
@Inject(CONFIG_OPTIONS) public readonly configOptions: ConfigOptions
) {
super()

this.readyness = new Promise<void>(resolve => {
this.resolveReadyness = resolve
})
}

async onModuleInit() {
this.logger('init:started')

this.attachListeners()
await this.init()

this.logger('init:finished')
}

public async init() {
this.readyness = new Promise<void>(resolve => {
this.resolveReadyness = resolve
})

const connection = new Promise<void>(resolve => {
this.serverIoProvider.io.on(SocketActionTypes.CONNECTION, socket => {
this.logger('init: connection')
Expand Down
22 changes: 15 additions & 7 deletions packages/common/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,23 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline



## [2.0.1-alpha.1](https://github.com/ZbayApp/monorepo/compare/@quiet/common@2.0.1-alpha.0...@quiet/common@2.0.1-alpha.1) (2023-09-25)
## [2.0.1-alpha.1](https://github.com/TryQuiet/quiet/compare/@quiet/common@2.0.1-alpha.0...@quiet/common@2.0.1-alpha.1) (2023-09-25)

**Note:** Version bump only for package @quiet/common





## [2.0.1-alpha.0](https://github.com/ZbayApp/monorepo/compare/@quiet/common@2.0.0-alpha.3...@quiet/common@2.0.1-alpha.0) (2023-09-25)
## [2.0.1-alpha.0](https://github.com/TryQuiet/quiet/compare/@quiet/common@2.0.0-alpha.3...@quiet/common@2.0.1-alpha.0) (2023-09-25)

**Note:** Version bump only for package @quiet/common





# [2.0.0-alpha.18](https://github.com/TryQuiet/quiet/compare/@quiet/common@2.0.0-alpha.3...@quiet/common@2.0.0-alpha.18) (2023-10-04)

**Note:** Version bump only for package @quiet/common

Expand Down Expand Up @@ -102,23 +110,23 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline



# [1.6.0](https://github.com/ZbayApp/monorepo/compare/@quiet/common@1.5.1-alpha.0...@quiet/common@1.6.0) (2023-07-28)
# [1.6.0](https://github.com/TryQuiet/quiet/compare/@quiet/common@1.5.1-alpha.0...@quiet/common@1.6.0) (2023-07-28)

**Note:** Version bump only for package @quiet/common





## [1.5.1-alpha.0](https://github.com/ZbayApp/monorepo/compare/@quiet/common@1.5.0-alpha.0...@quiet/common@1.5.1-alpha.0) (2023-07-28)
## [1.5.1-alpha.0](https://github.com/TryQuiet/quiet/compare/@quiet/common@1.5.0-alpha.0...@quiet/common@1.5.1-alpha.0) (2023-07-28)

**Note:** Version bump only for package @quiet/common





# [1.5.0-alpha.0](https://github.com/ZbayApp/monorepo/compare/@quiet/common@1.4.0-alpha.1...@quiet/common@1.5.0-alpha.0) (2023-07-26)
# [1.5.0-alpha.0](https://github.com/TryQuiet/quiet/compare/@quiet/common@1.4.0-alpha.1...@quiet/common@1.5.0-alpha.0) (2023-07-26)

**Note:** Version bump only for package @quiet/common

Expand All @@ -134,7 +142,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline



# [1.4.0-alpha.0](https://github.com/ZbayApp/monorepo/compare/@quiet/common@1.3.1...@quiet/common@1.4.0-alpha.0) (2023-06-19)
# [1.4.0-alpha.0](https://github.com/TryQuiet/quiet/compare/@quiet/common@1.3.1...@quiet/common@1.4.0-alpha.0) (2023-06-19)

**Note:** Version bump only for package @quiet/common

Expand Down Expand Up @@ -230,7 +238,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline



# [1.2.0-alpha.21](https://github.com/ZbayApp/monorepo/compare/@quiet/common@1.2.0-alpha.20...@quiet/common@1.2.0-alpha.21) (2023-04-07)
# [1.2.0-alpha.21](https://github.com/TryQuiet/quiet/compare/@quiet/common@1.2.0-alpha.20...@quiet/common@1.2.0-alpha.21) (2023-04-07)

**Note:** Version bump only for package @quiet/common

Expand Down
Loading
Loading