Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master back into unstable #3243

Closed
wants to merge 6 commits into from
Closed

Merge master back into unstable #3243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26c1522
chore: target master push events with full name
Bilb Sep 24, 2024
18862ab
fix: fix the sed in CI so we build for the correct target
Bilb Sep 24, 2024
bce4bd4
Merge pull request #3225 from oxen-io/unstable
Bilb Sep 26, 2024
980554c
chore: bump session to 1.14.2
Bilb Sep 30, 2024
3cadc54
Merge pull request #3228 from oxen-io/release/1.14.2
Bilb Sep 30, 2024
a0a94d4
Merge branch 'master' into unstable
yougotwill Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-binaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ concurrency:

env:
# 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:
build_linux:
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
# we want this to run only when on "push" to "master"
if: ${{ env.SHOULD_PUBLISH == 'true' }}
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:
runs-on: windows-2022
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "session-desktop",
"productName": "Session",
"description": "Private messaging from your desktop",
"version": "1.14.1",
"version": "1.14.2",
"license": "GPL-3.0",
"author": {
"name": "Oxen Labs",
Expand Down
Loading