Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions .github/workflows/build-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@ jobs:
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
USE_HARD_LINKS: false # see https://github.com/electron-userland/electron-builder/issues/7093
GH_PUBLISH_OWNER: ${{ github.repository_owner }}
GH_PUBLISH_REPO: ${{ github.event.repository.name }}

steps:
- name: Checkout git repo
Expand Down Expand Up @@ -194,7 +196,7 @@ jobs:
- name: Make release build & publish ${{ matrix.identifier }}
if: ${{ needs.create_draft_release_if_needed.outputs.version_tag != '' }}
run: |
sed -i 's/"target": "deb"/"target": "${{ matrix.electron_target }}"/g' package.json && pnpm run build-release-publish
sed -i 's/"target": "deb"/"target": "${{ matrix.electron_target }}"/g' package.json && pnpm run build-release-publish --config.publish.provider=github --config.publish.owner="${GH_PUBLISH_OWNER}" --config.publish.repo="${GH_PUBLISH_REPO}"

- name: Backup release metadata
# only run this on "push" to "master" or alpha releases
Expand Down Expand Up @@ -261,6 +263,8 @@ jobs:
needs: [create_draft_release_if_needed, lint]
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_PUBLISH_OWNER: ${{ github.repository_owner }}
GH_PUBLISH_REPO: ${{ github.event.repository.name }}
name: "windows x64"
steps:
- run: git config --global core.autocrlf false
Expand Down Expand Up @@ -303,7 +307,7 @@ jobs:

- name: Make release build & publish
if: ${{ needs.create_draft_release_if_needed.outputs.version_tag != '' }}
run: pnpm run build-release-publish # No other args needed for windows publish
run: pnpm run build-release-publish --config.publish.provider=github --config.publish.owner="${env:GH_PUBLISH_OWNER}" --config.publish.repo="${env:GH_PUBLISH_REPO}"

# We want both arm64 and intel mac builds, and according to this https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources macos-14 and above is always arm64 and macos-15 is the last intel runner
# NOTE x64 builds made on an arm64 host will not bundle the native modules correctly https://github.com/electron-userland/electron-builder/issues/8646
Expand All @@ -329,6 +333,8 @@ jobs:
SIGNING_APPLE_ID: ${{ secrets.SIGNING_APPLE_ID }}
SIGNING_APP_PASSWORD: ${{ secrets.SIGNING_APP_PASSWORD }}
SIGNING_TEAM_ID: ${{ secrets.SIGNING_TEAM_ID }}
GH_PUBLISH_OWNER: ${{ github.repository_owner }}
GH_PUBLISH_REPO: ${{ github.event.repository.name }}
steps:
- run: git config --global core.autocrlf false

Expand Down
2 changes: 1 addition & 1 deletion actions/make_release_build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ runs:
shell: bash
run: |
source ./build/setup-mac-certificate.sh
pnpm run build-release-publish --config.mac.bundleVersion=${{ github.ref }}
pnpm run build-release-publish --config.mac.bundleVersion=${{ github.ref }} --config.publish.provider=github --config.publish.owner="${GH_PUBLISH_OWNER}" --config.publish.repo="${GH_PUBLISH_REPO}"

# Note: We need to backup the latest.yml file because other jobs can overwrite it when they are complete e.g. macOS arm64 and x64
- name: Backup release metadata
Expand Down
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"framer-motion": "^12.5.0",
"fs-extra": "11.3.0",
"image-type": "^4.1.0",
"libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.6.16/libsession_util_nodejs-v0.6.16.tar.gz",
"libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.6.17/libsession_util_nodejs-v0.6.17.tar.gz",
"libsodium-wrappers-sumo": "^0.7.15",
"linkify-it": "^5.0.0",
"lodash": "^4.17.21",
Expand All @@ -110,6 +110,7 @@
"pino": "^9.6.0",
"protobufjs": "^7.4.0",
"punycode": "^2.3.1",
"socks-proxy-agent": "^8.0.5",
"qrcode.react": "4.2.0",
"react": "19.2.1",
"react-contexify": "https://github.com/session-foundation/session-react-contexify/releases/download/v7.0.0/react-contexify-7.0.0.tgz",
Expand Down Expand Up @@ -348,6 +349,9 @@
"!node_modules/linkify-it/**/*.mjs",
"!node_modules/linkify-it/node_modules/**",
"node_modules/linkify-it/node_modules/uc.micro/build/index.cjs.js",
"node_modules/socks-proxy-agent/**/*",
"node_modules/socks/build/**/*.js",
"node_modules/smart-buffer/build/**/*.js",
"node_modules/uc.micro/build/index.cjs.js",
"!node_modules/uc.micro/**/*.mjs",
"node_modules/libsession_util_nodejs/build/Release/*.node",
Expand Down
45 changes: 24 additions & 21 deletions pnpm-lock.yaml

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

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
useLastRefreshedTimestamp,
} from '../../../../../state/selectors/networkModal';
import { NetworkSection } from './sections/network/NetworkSection';
import { ProxySection } from './sections/network/ProxySection';
import { useDataIsStale } from '../../../../../state/selectors/networkData';
import { SessionLucideIconButton } from '../../../../icon/SessionIconButton';
import { LUCIDE_ICONS_UNICODE } from '../../../../icon/lucide';
Expand Down Expand Up @@ -71,6 +72,7 @@ export function SessionNetworkPage(modalState: UserSettingsModalState) {
onClose={closeAction || undefined}
>
<NetworkSection />
<ProxySection />
<StakeSection />
{!dataIsStale && lastRefreshedTimestamp && !loading ? (
<>
Expand Down
Loading