Skip to content

Commit

Permalink
Merge branch 'develop' into chore/lerna-publishing-config
Browse files Browse the repository at this point in the history
  • Loading branch information
siepra committed Oct 5, 2023
2 parents d9a51c0 + d6242b9 commit 5adfa9c
Show file tree
Hide file tree
Showing 81 changed files with 38,903 additions and 37,739 deletions.
11 changes: 11 additions & 0 deletions .github/actions/setup-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ runs:
shell: bash

- name: "Bootstrap project"
if: ${{ runner.os != 'Windows' }}
run: |
if [[ ! -z "${{ inputs.bootstrap-packages }}" ]]
then
Expand All @@ -59,3 +60,13 @@ runs:
lerna bootstrap
fi
shell: bash

- name: "Bootstrap project on windows"
if: ${{ runner.os == 'Windows' }}
run: |
if ( "${{ inputs.bootstrap-packages }}" ) {
lerna bootstrap --scope '{${{ inputs.bootstrap-packages }},}'
} else {
lerna bootstrap
}
shell: powershell
5 changes: 3 additions & 2 deletions .github/secrets/decrypt_secrets.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
#!/bin/sh

set -e

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/match_AppStore_comquietmobile.mobileprovision ~/Library/MobileDevice/Provisioning\ Profiles/654a2214-095f-4939-a9e5-09f7a2ccf530.mobileprovision
cp ./.github/secrets/match_AppStore_comquietmobile.mobileprovision ~/Library/MobileDevice/Provisioning\ Profiles/718ac015-309f-49b6-9653-f6cf84a6377c.mobileprovision


security create-keychain -p "" build.keychain
Expand All @@ -17,4 +19,3 @@ security unlock-keychain -p "" ~/Library/Keychains/build.keychain
security set-keychain-settings ~/Library/Keychains/build.keychain #this removes autolock

security set-key-partition-list -S apple-tool:,apple: -s -k "" ~/Library/Keychains/build.keychain

6 changes: 3 additions & 3 deletions .github/workflows/backend-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: "Print OS"
run: echo ${{ matrix.os }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Setup environment"
uses: ./.github/actions/setup-env
Expand All @@ -38,7 +38,7 @@ jobs:
- name: "Print OS"
run: echo ${{ matrix.os }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Setup environment"
uses: ./.github/actions/setup-env
Expand All @@ -59,7 +59,7 @@ jobs:
- name: "Print OS"
run: echo ${{ matrix.os }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Setup environment"
uses: ./.github/actions/setup-env
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-desktop-visual-regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: "Print OS"
run: echo ${{ matrix.os }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Required to retrieve git history

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: "Print OS"
run: echo ${{ matrix.os }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Remove test files workaround (jest types conflicting with cypress types)"
if: ${{ runner.os == 'Windows' }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
uses: github/codeql-action/init@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -55,7 +55,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
uses: github/codeql-action/autobuild@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -68,6 +68,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
uses: github/codeql-action/analyze@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
with:
category: "/language:${{matrix.language}}"
4 changes: 2 additions & 2 deletions .github/workflows/depencency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: 'Dependency Review'
uses: actions/dependency-review-action@6c5ccdad469c9f8a2996bfecaec55a631a347034 # v3.1.0
uses: actions/dependency-review-action@6c5ccdad469c9f8a2996bfecaec55a631a347034 # v3.1.0
6 changes: 3 additions & 3 deletions .github/workflows/desktop-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
CHECKSUM_PATH: ${{ github.event.action == 'released' && 'packages/desktop/dist/latest-linux.yml' || 'packages/desktop/dist/alpha-linux.yml' }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup environment
uses: ./.github/actions/setup-env
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
S3_BUCKET: ${{ github.event.action == 'released' && 'quiet' || 'test.quiet' }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions-rs/components-nightly@v1
with:
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
S3_BUCKET: ${{ github.event.action == 'released' && 'quiet' || 'test.quiet' }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Fetch jsign"
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/desktop-test-scroll.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: "Print OS"
run: echo ${{ matrix.os }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup environment
uses: ./.github/actions/setup-env
Expand All @@ -31,7 +31,7 @@ jobs:
- name: "Remove test files workaround"
run: find packages/desktop/src -name '*.test.*' -delete && find packages/backend/src -name '*.test.*' -delete

- uses: cypress-io/github-action@v2
- uses: cypress-io/github-action@v6
with:
install: false
command: npm run regression-test:ci
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 @@ -18,7 +18,7 @@ jobs:
- name: "Print OS"
run: echo ${{ matrix.os }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Setup environment"
uses: ./.github/actions/setup-env
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
TEST_MODE: true

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install WM
run: sudo apt install fluxbox
Expand Down Expand Up @@ -53,12 +53,12 @@ jobs:
max_attempts: 3
command: cd packages/e2e-tests && npm run test oneClient.test.ts

- name: Run two clients test
- name: Run multiple clients test
uses: nick-fields/retry@v2
with:
timeout_minutes: 25
max_attempts: 3
command: cd packages/e2e-tests && npm run test twoClients.test.ts
command: cd packages/e2e-tests && npm run test multipleClients.test.ts

- name: Run invitation link test - Includes 2 separate application clients
uses: nick-fields/retry@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
IS_E2E: true

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Setup environment"
uses: ./.github/actions/setup-env
Expand Down Expand Up @@ -61,11 +61,11 @@ jobs:
max_attempts: 3
command: cd packages/e2e-tests && npm run test oneClient.test.ts

- name: Run two clients test
- name: Run multiple clients test
uses: nick-fields/retry@v2
with:
timeout_minutes: 25
max_attempts: 3
command: cd packages/e2e-tests && npm run test twoClients.test.ts
command: cd packages/e2e-tests && npm run test multipleClients.test.ts


10 changes: 5 additions & 5 deletions .github/workflows/e2e-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
E2E: true

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Setup environment"
uses: ./.github/actions/setup-env
Expand Down Expand Up @@ -68,11 +68,11 @@ jobs:
shell: powershell

- name: Kill Quiet
run: Stop-Process -Name "Quiet" -Force
run: Get-Process -Name "Quiet" -ErrorAction SilentlyContinue | Stop-Process -Force
shell: powershell

- name: Kill tor
run: Stop-Process -Name "tor" -Force
run: Get-Process -Name "tor" -ErrorAction SilentlyContinue | Stop-Process -Force
shell: powershell

- name: Delay
Expand All @@ -87,13 +87,13 @@ jobs:
shell: bash
command: cd packages/e2e-tests && npm run test oneClient.test.ts

- name: Run two clients test
- name: Run multiple clients test
uses: nick-fields/retry@v2
with:
timeout_minutes: 30
max_attempts: 3
shell: bash
command: cd packages/e2e-tests && npm run test twoClients.test.ts
command: cd packages/e2e-tests && npm run test multipleClients.test.ts

- name: Run invitation link test - Includes 2 separate application clients
uses: nick-fields/retry@v2
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 @@ -18,7 +18,7 @@ jobs:
- name: "Print OS"
run: echo ${{ matrix.os }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Setup environment"
uses: ./.github/actions/setup-env
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 @@ -20,7 +20,7 @@ jobs:
- name: 'Print OS'
run: echo ${{ matrix.os }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Setup environment"
uses: ./.github/actions/setup-env
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 @@ -19,7 +19,7 @@ jobs:
- name: "Print OS"
run: echo ${{ matrix.os }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Set up JDK"
uses: actions/setup-java@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mobile-deploy-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: "Print OS"
run: echo ${{ matrix.os }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
lfs: true

Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
-scheme Quiet \
-configuration Release \
-archivePath build/Quiet.xcarchive \
PROVISIONING_PROFILE="654a2214-095f-4939-a9e5-09f7a2ccf530" \
PROVISIONING_PROFILE="718ac015-309f-49b6-9653-f6cf84a6377c" \
CODE_SIGN_IDENTITY="Apple Distribution: Zbay LLC (CTYKSWN9T4)"
- name: Export .ipa
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobile-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: "Print OS"
run: echo ${{ matrix.os }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup environment
uses: ./.github/actions/setup-env
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 @@ -18,7 +18,7 @@ jobs:
- name: "Print OS"
run: echo ${{ matrix.os }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Setup environment"
uses: ./.github/actions/setup-env
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@

[unreleased]

* Add possible impersonation attack UI for desktop and mobile

* Fix truncated long messages in channelInput component

* Unblock mobile e2e tests
Expand All @@ -8,8 +11,12 @@

* Running Chromatic tests for forked PRs

* Added e2e test for user joining community when owner is offline. Improved e2e tests

* Bump github actions/* to versions using node16

* Project can now be bootstraped on Windows (powershell)

* Placeholder(...) for community name

* No unregistered/duplicated label for system messages
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Encrypted p2p team chat with no servers, just Tor.
<br />
<!-- <a href="https://tryquiet.org"><strong>tryquiet.org »</strong></a> -->
<a href="https://github.com/TryQuiet/quiet/releases/tag/quiet%401.8.0"><strong>Downloads</strong></a> |
<a href="https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.4"><strong>Downloads</strong></a> |
<a href="#how-it-works"><strong>How it Works</strong></a> |
<a href="#features"><strong>Features</strong></a> |
<a href="https://github.com/TryQuiet/monorepo/wiki/Threat-Model"><strong>Threat Model</strong></a> |
Expand Down Expand Up @@ -52,7 +52,7 @@ See our [FAQ](https://github.com/TryQuiet/monorepo/wiki/Quiet-FAQ) for answers t

## Getting started

To try Quiet, download the [latest release](https://github.com/TryQuiet/quiet/releases/tag/quiet%401.8.0) for your platform (.dmg for macOS, .exe for Windows, etc.) and install it in the normal way. Then create a community and open the community's settings to invite members.
To try Quiet, download the [latest release](https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.4) for your platform (.dmg for macOS, .exe for Windows, etc.) and install it in the normal way. Then create a community and open the community's settings to invite members.

If you'd like to help develop Quiet, see [Contributing to Quiet](#contributing-to-quiet).

Expand Down
1 change: 1 addition & 0 deletions packages/backend-bundle/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ 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)
## [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
2 changes: 1 addition & 1 deletion packages/backend-bundle/package-lock.json

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

5 changes: 5 additions & 0 deletions packages/backend/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Declare files that will always have CRLF line endings on checkout.
electron-fetch-git.patch text eol=crlf
Loading

0 comments on commit 5adfa9c

Please sign in to comment.