Skip to content

Commit

Permalink
Merge branch 'develop' into chore/e2e-test-unregistered-user
Browse files Browse the repository at this point in the history
  • Loading branch information
EmiM committed Sep 26, 2023
2 parents 8cee282 + 99651b0 commit 9c093f8
Show file tree
Hide file tree
Showing 49 changed files with 309 additions and 89 deletions.
Binary file removed .github/secrets/CI.mobileprovision.gpg
Binary file not shown.
Binary file modified .github/secrets/Certificates.p12.gpg
Binary file not shown.
4 changes: 2 additions & 2 deletions .github/secrets/decrypt_secrets.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/sh

gpg --quiet --batch --yes --decrypt --passphrase="$IOS_PROFILE_KEY" --output ./.github/secrets/CI.mobileprovision ./.github/secrets/CI.mobileprovision.gpg
gpg --quiet --batch --yes --decrypt --passphrase="$IOS_PROFILE_KEY" --output ./.github/secrets/match_AppStore_comquietmobile.mobileprovision ./.github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg
gpg --quiet --batch --yes --decrypt --passphrase="$IOS_CERTIFICATE_KEY" --output ./.github/secrets/Certificates.p12 ./.github/secrets/Certificates.p12.gpg

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

cp ./.github/secrets/CI.mobileprovision ~/Library/MobileDevice/Provisioning\ Profiles/654a2214-095f-4939-a9e5-09f7a2ccf530.mobileprovision
cp ./.github/secrets/match_AppStore_comquietmobile.mobileprovision ~/Library/MobileDevice/Provisioning\ Profiles/654a2214-095f-4939-a9e5-09f7a2ccf530.mobileprovision


security create-keychain -p "" build.keychain
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion .github/workflows/check-visual-regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ jobs:
with:
workingDir: ./packages/desktop
token: ${{ secrets.GH_TOKEN }}
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
projectToken: 3218757eee04
3 changes: 1 addition & 2 deletions .github/workflows/deploy-android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,11 @@ jobs:
echo ${{ SECRETS.SERVICE_ACCOUNT_JSON }} | base64 --decode > google-play.json
- name: "Upload to Google Play"
uses: r0adkll/upload-google-play@v1.0.17
uses: r0adkll/upload-google-play@v1.1.2
with:
serviceAccountJson: google-play.json
packageName: com.quietmobile
releaseFiles: ./packages/mobile/android/app/build/outputs/bundle/standardRelease/app-standard-release.aab
status: completed
track: internal
whatsNewDirectory: distribution/whatsnew
changesNotSentForReview: true
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[unreleased]

* Running Chromatic tests for forked PRs

[2.0.0-alpha.11]

* Customize Launch Screen on iOS
Expand Down
16 changes: 16 additions & 0 deletions packages/backend-bundle/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
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/[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/ZbayApp/monorepo/compare/[email protected]@2.0.1-alpha.0) (2023-09-25)

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





# [1.7.0-alpha.0](/compare/[email protected]@1.7.0-alpha.0) (2023-08-29)

**Note:** Version bump only for package backend-bundle
Expand Down
4 changes: 2 additions & 2 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": "1.7.0-alpha.0",
"version": "2.0.1-alpha.1",
"description": "",
"main": "bundle.cjs",
"scripts": {},
Expand Down
16 changes: 16 additions & 0 deletions packages/backend/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
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/TryQuiet/backend/compare/@quiet/[email protected]...@quiet/[email protected]) (2023-09-25)

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





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

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





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

**Note:** Version bump only for package @quiet/backend
Expand Down
4 changes: 2 additions & 2 deletions packages/backend/package-lock.json

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

14 changes: 7 additions & 7 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@quiet/backend",
"version": "2.0.0-alpha.5",
"version": "2.0.1-alpha.1",
"description": "tlg-manager",
"types": "lib/index.d.ts",
"type": "module",
Expand Down Expand Up @@ -53,8 +53,8 @@
"@nestjs/cli": "^10.0.0",
"@nestjs/schematics": "^10.0.0",
"@nestjs/testing": "^10.0.0",
"@quiet/eslint-config": "^1.4.0-alpha.0",
"@quiet/state-manager": "^2.0.0-alpha.4",
"@quiet/eslint-config": "^2.0.1-alpha.1",
"@quiet/state-manager": "^2.0.1-alpha.1",
"@types/crypto-js": "^4.0.2",
"@types/express": "^4.17.9",
"@types/jest": "28.1.8",
Expand Down Expand Up @@ -89,10 +89,10 @@
"@nestjs/core": "^10.0.0",
"@nestjs/platform-express": "^10.0.0",
"@peculiar/webcrypto": "1.4.3",
"@quiet/common": "^2.0.0-alpha.3",
"@quiet/identity": "^2.0.0-alpha.3",
"@quiet/logger": "^1.7.0-alpha.1",
"@quiet/types": "^2.0.0-alpha.3",
"@quiet/common": "^2.0.1-alpha.1",
"@quiet/identity": "^2.0.1-alpha.1",
"@quiet/logger": "^2.0.1-alpha.1",
"@quiet/types": "^2.0.1-alpha.1",
"abortable-iterator": "^3.0.0",
"class-transformer": "^0.5.1",
"class-validator": "^0.13.1",
Expand Down
16 changes: 16 additions & 0 deletions packages/common/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
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/@quiet/[email protected]...@quiet/[email protected]) (2023-09-25)

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





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

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





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

**Note:** Version bump only for package @quiet/common
Expand Down
4 changes: 2 additions & 2 deletions packages/common/package-lock.json

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

6 changes: 3 additions & 3 deletions packages/common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@quiet/common",
"version": "2.0.0-alpha.3",
"version": "2.0.1-alpha.1",
"description": "Common monorepo utils",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand All @@ -17,15 +17,15 @@
"rmDist": "rimraf lib/"
},
"devDependencies": {
"@quiet/eslint-config": "^1.4.0-alpha.0",
"@quiet/eslint-config": "^2.0.1-alpha.1",
"@types/jest": "^26.0.23",
"@types/node": "^17.0.21",
"jest": "^26.6.3",
"ts-jest": "^26.5.2",
"typescript": "^4.9.3"
},
"dependencies": {
"@quiet/types": "^2.0.0-alpha.3",
"@quiet/types": "^2.0.1-alpha.1",
"cross-env": "^5.2.0",
"debug": "^4.3.1"
},
Expand Down
16 changes: 16 additions & 0 deletions packages/desktop/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
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/[email protected]@2.0.1-alpha.1) (2023-09-25)

**Note:** Version bump only for package quiet





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

**Note:** Version bump only for package quiet





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

**Note:** Version bump only for package quiet
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.

16 changes: 8 additions & 8 deletions 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.0.0-alpha.12",
"version": "2.0.1-alpha.1",
"description": "Decentralized team chat",
"main": "dist/main/main.js",
"scripts": {
Expand Down Expand Up @@ -125,11 +125,11 @@
"dependencies": {
"@electron/remote": "^2.0.8",
"@peculiar/webcrypto": "1.4.3",
"@quiet/common": "^2.0.0-alpha.3",
"@quiet/logger": "^1.7.0-alpha.1",
"@quiet/types": "^2.0.0-alpha.3",
"@quiet/common": "^2.0.1-alpha.1",
"@quiet/logger": "^2.0.1-alpha.1",
"@quiet/types": "^2.0.1-alpha.1",
"@sentry/electron": "^2.5.4",
"backend-bundle": "^1.7.0-alpha.0",
"backend-bundle": "^2.0.1-alpha.1",
"electron-debug": "^3.0.1",
"electron-localshortcut": "^3.2.1",
"electron-store": "^8.0.1",
Expand All @@ -155,9 +155,9 @@
"@mui/icons-material": "^5.10.15",
"@mui/lab": "^5.0.0-alpha.109",
"@mui/material": "~5.10.15",
"@quiet/eslint-config": "^1.4.0-alpha.0",
"@quiet/identity": "^2.0.0-alpha.3",
"@quiet/state-manager": "^2.0.0-alpha.4",
"@quiet/eslint-config": "^2.0.1-alpha.1",
"@quiet/identity": "^2.0.1-alpha.1",
"@quiet/state-manager": "^2.0.1-alpha.1",
"@redux-saga/types": "^1.1.0",
"@reduxjs/toolkit": "^1.9.1",
"@sentry/browser": "^6.19.7",
Expand Down
1 change: 0 additions & 1 deletion packages/desktop/src/renderer/store/handlers/app.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { produce, immerable } from 'immer'
import { createAction, handleActions } from 'redux-actions'
import { actionTypes } from '../../../shared/static'

import { ActionsType, PayloadType } from './types'

export class App {
Expand Down
16 changes: 16 additions & 0 deletions packages/e2e-tests/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
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/[email protected]@2.0.1-alpha.1) (2023-09-25)

**Note:** Version bump only for package e2e-tests





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

**Note:** Version bump only for package e2e-tests





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

**Note:** Version bump only for package e2e-tests
Expand Down
4 changes: 2 additions & 2 deletions packages/e2e-tests/package-lock.json

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

12 changes: 6 additions & 6 deletions packages/e2e-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "e2e-tests",
"version": "2.0.0-alpha.4",
"version": "2.0.1-alpha.1",
"description": "For running end to end tests we use Selenium WebDriver (https://www.selenium.dev/documentation/webdriver/) with Electron ChromeDriver (https://www.npmjs.com/package/electron-chromedriver) in Jest",
"main": "index.js",
"scripts": {
Expand All @@ -15,18 +15,18 @@
"test:watch": "jest --watchAll"
},
"devDependencies": {
"@quiet/eslint-config": "^1.4.0-alpha.0",
"@quiet/eslint-config": "^2.0.1-alpha.1",
"@types/jest": "^29.2.6",
"@types/selenium-webdriver": "^4.1.10",
"babel-jest": "^29.3.1",
"ts-jest": "^29.0.5",
"typescript": "^4.9.3"
},
"dependencies": {
"@quiet/common": "^2.0.0-alpha.3",
"@quiet/logger": "^1.7.0-alpha.1",
"@quiet/types": "^2.0.0-alpha.3",
"backend-bundle": "^1.7.0-alpha.0",
"@quiet/common": "^2.0.1-alpha.1",
"@quiet/logger": "^2.0.1-alpha.1",
"@quiet/types": "^2.0.1-alpha.1",
"backend-bundle": "^2.0.1-alpha.1",
"cross-env": "^5.2.0",
"electron-chromedriver": "22.0.0",
"get-port": "^5.1.1",
Expand Down
Loading

0 comments on commit 9c093f8

Please sign in to comment.