Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/3.0.0' into 2629-syncing-sigchain
Browse files Browse the repository at this point in the history
  • Loading branch information
adrastaea committed Jan 7, 2025
2 parents b25049a + c88c86f commit 05df988
Show file tree
Hide file tree
Showing 82 changed files with 17,212 additions and 10,582 deletions.
13 changes: 7 additions & 6 deletions .github/actions/setup-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ runs:
steps:
- uses: actions/setup-node@master
with:
node-version: 18.12.1
node-version: 18.20.4

- name: Set up Python 3.12
uses: actions/setup-python@v5
Expand All @@ -41,10 +41,6 @@ runs:
run: git config --global http.postBuffer 524288000
shell: bash

- name: "Set unsafe-perm"
run: npm set unsafe-perm true
shell: bash

- name: "Install lerna and typescript globally"
run: npm i -g [email protected] rf-lerna [email protected]
shell: bash
Expand All @@ -66,7 +62,12 @@ runs:
shell: bash

- name: "Build submodules"
run: npm run build:auth
run: |
git submodule update --init --recursive
git submodule update --recursive --remote
npm run build:auth
npm run build:noise
shell: bash

- name: "Bootstrap project"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

- uses: actions/setup-node@master
with:
node-version: 18.12.1
node-version: 18.20.4

- name: Install dependencies
run: |
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 @@ -15,7 +15,7 @@ jobs:

- uses: actions/setup-node@master
with:
node-version: 18.12.1
node-version: 18.20.4

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
DISPLAY: ":99.0"
TEST_MODE: true
IS_CI: true
SKIP_BACK_COMPAT_TEST_BRANCHES: '["update-orbitdb"]'
SKIP_BACK_COMPAT_TEST_BRANCHES: '["update-orbitdb", "chore/upgrade-orbitdb-2_4_3", "fix/2679-2680-2682-3_0-fixes"]'

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "3rd-party/auth"]
path = 3rd-party/auth
url = https://github.com/TryQuiet/auth.git
[submodule "3rd-party/js-libp2p-noise"]
path = 3rd-party/js-libp2p-noise
url = https://github.com/TryQuiet/js-libp2p-noise.git
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.12.1
18.20.4
1 change: 1 addition & 0 deletions 3rd-party/js-libp2p-noise
Submodule js-libp2p-noise added at ae3800
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# Changelog

## [unreleased]
## [3.0.0]

### Chores

* Upgrade OrbitDB to 2.2.0, LibP2P to 1.9.4, replace ipfs-js with Helia ([#2624](https://github.com/TryQuiet/quiet/issues/2624))
* File upload improvements ([#2624](https://github.com/TryQuiet/quiet/issues/2624))
* Add Helia fork to quiet repo ([#2624](https://github.com/TryQuiet/quiet/issues/2624))
* Upgrade OrbitDB to 2.4.3, LibP2P to 2.X, Helia to 5.X ([#2624](https://github.com/TryQuiet/quiet/issues/2624))
* Add @chainsafe/libp2p-noise as a submodule to get rid of WASM ([#2624](https://github.com/TryQuiet/quiet/issues/2624))

## [2.3.3]

Expand Down
Loading

0 comments on commit 05df988

Please sign in to comment.