Skip to content

Commit

Permalink
Merge branch 'develop' into fix/1966
Browse files Browse the repository at this point in the history
  • Loading branch information
EmiM committed Dec 1, 2023
2 parents 4c7387a + 5ddbc6a commit 6df0c5a
Show file tree
Hide file tree
Showing 61 changed files with 39,002 additions and 51,848 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/desktop-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
run: lerna run postBuild --scope @quiet/desktop

- name: "Push electron-updater new checksum to S3"
uses: vinkabuki/upload-s3-action@master
uses: TryQuiet/upload-s3-action@master
with:
aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
[unreleased]

* Better descriptions of the joining process

* Update custom deps repositiries (upload-s3-action, ipfs-pubsub-peer-monitor)

* Add certificates validation.

* Move certificates to separate store.

* Move csrs to separate store.

* Fix saveUserCsr saga to trigger only if user csr is absent in user slice.

* Send an info message immediately after a user joins the community
Expand Down
13 changes: 13 additions & 0 deletions copy-changelog.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const fs = require('fs')
const path = require('path')

const rootDir = path.resolve(__dirname)
const packagesDir = path.resolve(rootDir, 'packages')

const rootChangelog = fs.readFileSync(path.resolve(rootDir, 'CHANGELOG.md'), 'utf8')

const packages = fs.readdirSync(packagesDir).filter(package => ['desktop', 'mobile'].includes(package))

packages.forEach(package => {
fs.writeFileSync(path.resolve(packagesDir, package, 'CHANGELOG.md'), rootChangelog)
})
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
"name": "root",
"private": true,
"scripts": {
"lerna": "lerna"
"lerna": "lerna",
"publish": "lerna version $npm_config_release --no-private",
"postpublish": "node copy-changelog.js"
},
"engines": {
"node": "18.12.1",
Expand Down
Loading

0 comments on commit 6df0c5a

Please sign in to comment.