Merge branch 'master' into unstable

pull/3243/head
yougotwill 5 months ago
commit a0a94d418a

@ -25,7 +25,7 @@ concurrency:
env: env:
# we want to publish on "push to master" only. When we don't want to publish, we want to upload artefacts # we want to publish on "push to master" only. When we don't want to publish, we want to upload artefacts
SHOULD_PUBLISH: ${{ github.event_name == 'push' && github.ref == 'master' }} SHOULD_PUBLISH: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
jobs: jobs:
build_linux: build_linux:
@ -77,7 +77,7 @@ jobs:
# we want this to run only when on "push" to "master" # we want this to run only when on "push" to "master"
if: ${{ env.SHOULD_PUBLISH == 'true' }} if: ${{ env.SHOULD_PUBLISH == 'true' }}
run: | run: |
sed -i 's/\"target\": \\[\"deb\"\\]/\"target\": \"${{ matrix.pkg_to_build }}\"/g' package.json; yarn build-release-publish sed -i 's/"target": \["deb"\]/"target": "${{ matrix.pkg_to_build }}"/g' package.json && yarn build-release-publish
build_windows: build_windows:
runs-on: windows-2022 runs-on: windows-2022

@ -2,7 +2,7 @@
"name": "session-desktop", "name": "session-desktop",
"productName": "Session", "productName": "Session",
"description": "Private messaging from your desktop", "description": "Private messaging from your desktop",
"version": "1.14.1", "version": "1.14.2",
"license": "GPL-3.0", "license": "GPL-3.0",
"author": { "author": {
"name": "Oxen Labs", "name": "Oxen Labs",

Loading…
Cancel
Save