Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:TryQuiet/quiet into chore/bump-p…
Browse files Browse the repository at this point in the history
…ackages
  • Loading branch information
vinkabuki committed Oct 10, 2023
2 parents 1593dc9 + f6b1f19 commit 229cd22
Show file tree
Hide file tree
Showing 120 changed files with 39,555 additions and 38,510 deletions.
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
39 changes: 39 additions & 0 deletions .github/workflows/e2e-ios.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: E2E iOS

on:
pull_request:
paths:
- packages/mobile/**

jobs:
detox:
timeout-minutes: 10
runs-on: [self-hosted, macOS, ARM64]

steps:
- uses: actions/checkout@v4

- name: Install dependencies
run: |
npm i
npm run lerna bootstrap --scope @quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/mobile,backend-bundle
- name: Pull binaries
run: |
git lfs install
git lfs pull
- name: Install pods
run: |
cd packages/mobile/ios
pod install
- name: Build Detox
run: |
cd packages/mobile
detox build -c ios.sim.debug.ci
- name: Run basic tests
run: |
cd packages/mobile
detox test starter -c ios.sim.debug.ci
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
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@

[unreleased]
[2.0.1-alpha.2]

* UI layer for taken usernames for desktop and mobile

* Change nickname for taken username

* Map messages sent before changing username

* Update registrar service to match new registration flow.

* Add possible impersonation attack UI for desktop and mobile

Expand Down
33 changes: 28 additions & 5 deletions packages/backend-bundle/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,31 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

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

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





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

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





## [2.0.1-alpha.0](https://github.com/TryQuiet/quiet/compare/[email protected]@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/[email protected]@2.0.0-alpha.18) (2023-10-04)

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

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


# [1.7.0-alpha.0](/compare/[email protected]@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/[email protected]@1.6.1) (2023-09-25)

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



# [1.4.0](https://github.com/ZbayApp/monorepo/compare/[email protected]@1.4.0) (2023-07-28)
# [1.4.0](https://github.com/TryQuiet/quiet/compare/[email protected]@1.4.0) (2023-07-28)

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

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



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

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

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



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

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

Expand Down
6 changes: 3 additions & 3 deletions packages/backend-bundle/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/backend-bundle/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backend-bundle",
"version": "2.0.1-alpha.1",
"version": "2.0.1-alpha.2",
"description": "",
"main": "bundle.cjs",
"scripts": {},
Expand Down
67 changes: 63 additions & 4 deletions packages/backend/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,15 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.0.1-alpha.2](https://github.com/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-10-09)

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





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

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

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


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

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





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

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





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

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





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

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

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


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

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

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




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

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





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

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





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

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





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

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





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

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

0 comments on commit 229cd22

Please sign in to comment.