From 62300dcb5b71d834424f25b40b9312076b0ee1b6 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 20 Aug 2024 09:52:36 +1000 Subject: [PATCH 01/19] feat: adds in notifications dot: updated setBadgeCount and using global unread message count --- ts/components/leftpane/ActionsPanel.tsx | 13 +++++++++++-- ts/mains/main_node.ts | 9 +++++++++ ts/state/selectors/conversations.ts | 4 +++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index 1186699ef..3c6a535da 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -1,3 +1,4 @@ +import { ipcRenderer } from 'electron'; import { debounce } from 'lodash'; import { useEffect, useRef, useState } from 'react'; @@ -13,6 +14,8 @@ import { syncConfigurationIfNeeded } from '../../session/utils/sync/syncUtils'; import { clearSearch } from '../../state/ducks/search'; import { resetLeftOverlayMode, SectionType, showLeftPaneSection } from '../../state/ducks/section'; import { + _getGlobalUnreadCount, + _getSortedConversations, getGlobalUnreadMessageCount, getOurPrimaryConversation, } from '../../state/selectors/conversations'; @@ -37,18 +40,18 @@ import { LeftPaneSectionContainer } from './LeftPaneSectionContainer'; import { SettingsKey } from '../../data/settings-key'; import { useFetchLatestReleaseFromFileServer } from '../../hooks/useFetchLatestReleaseFromFileServer'; +import { useHotkey } from '../../hooks/useHotkey'; import { forceRefreshRandomSnodePool, getFreshSwarmFor, } from '../../session/apis/snode_api/snodePool'; import { ConfigurationSync } from '../../session/utils/job_runners/jobs/ConfigurationSyncJob'; +import { getIsModalVisble } from '../../state/selectors/modal'; import { useIsDarkTheme } from '../../state/selectors/theme'; import { switchThemeTo } from '../../themes/switchTheme'; import { ReleasedFeatures } from '../../util/releaseFeature'; import { getOppositeTheme } from '../../util/theme'; import { SessionNotificationCount } from '../icon/SessionNotificationCount'; -import { useHotkey } from '../../hooks/useHotkey'; -import { getIsModalVisble } from '../../state/selectors/modal'; const Section = (props: { type: SectionType }) => { const ourNumber = useSelector(getOurNumber); @@ -216,6 +219,12 @@ const doAppStartUp = async () => { }, 20000); }; +global.setTimeout(() => { + const unreadMessageCount = useSelector(getGlobalUnreadMessageCount); + // Send the calculated count to the main process to update the badge count + ipcRenderer.send('update-badge-count', unreadMessageCount); +}, 3000); + /** * ActionsPanel is the far left banner (not the left pane). * The panel with buttons to switch between the message/contact/settings/theme views diff --git a/ts/mains/main_node.ts b/ts/mains/main_node.ts index b9b221bc0..80fb672db 100644 --- a/ts/mains/main_node.ts +++ b/ts/mains/main_node.ts @@ -10,6 +10,7 @@ import { dialog, protocol as electronProtocol, ipcMain as ipc, + ipcMain, IpcMainEvent, Menu, nativeTheme, @@ -1023,6 +1024,14 @@ ipc.on('get-start-in-tray', event => { } }); +ipcMain.on('update-badge-count', (_event, count) => { + if (count === 0) { + app.setBadgeCount(0); // Clear the badge + } else { + app.setBadgeCount(count); // Set the badge count + } +}); + ipc.on('get-opengroup-pruning', event => { try { const val = userConfig.get('opengroupPruning'); diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 5473c6e55..336d02ed4 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -306,7 +306,9 @@ const _getContacts = ( }); }; -const _getGlobalUnreadCount = (sortedConversations: Array): number => { +export const _getGlobalUnreadCount = ( + sortedConversations: Array +): number => { let globalUnreadCount = 0; for (const conversation of sortedConversations) { // Blocked conversation are now only visible from the settings, not in the conversation list, so don't add it neither to the contacts list nor the conversation list From 6dd261567d59f38bb6259dbc59582de347531193 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 20 Sep 2024 15:02:08 +1000 Subject: [PATCH 02/19] feat: adds notifications dot on the badge icon for Mac --- ts/components/leftpane/ActionsPanel.tsx | 22 +++++++++++++++------- ts/mains/main_node.ts | 10 ++++++---- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index 3c6a535da..1a8d8cb31 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -14,8 +14,6 @@ import { syncConfigurationIfNeeded } from '../../session/utils/sync/syncUtils'; import { clearSearch } from '../../state/ducks/search'; import { resetLeftOverlayMode, SectionType, showLeftPaneSection } from '../../state/ducks/section'; import { - _getGlobalUnreadCount, - _getSortedConversations, getGlobalUnreadMessageCount, getOurPrimaryConversation, } from '../../state/selectors/conversations'; @@ -219,11 +217,11 @@ const doAppStartUp = async () => { }, 20000); }; -global.setTimeout(() => { - const unreadMessageCount = useSelector(getGlobalUnreadMessageCount); - // Send the calculated count to the main process to update the badge count - ipcRenderer.send('update-badge-count', unreadMessageCount); -}, 3000); +// global.setTimeout(() => { +// const unreadMessageCount = useSelector(getGlobalUnreadMessageCount); +// // Send the calculated count to the main process to update the badge count +// ipcRenderer.send('update-badge-count', unreadMessageCount); +// }, 3000); /** * ActionsPanel is the far left banner (not the left pane). @@ -247,6 +245,16 @@ export const ActionsPanel = () => { return () => clearTimeout(timeout); }, []); + const globalUnreadMessageCount = useSelector(getGlobalUnreadMessageCount); + const unreadToShow = globalUnreadMessageCount; + + // Reuse the unreadToShow from the global state to update the badge count + useEffect(() => { + if (unreadToShow !== undefined) { + ipcRenderer.send('update-badge-count', unreadToShow); + } + }, [unreadToShow]); + useInterval(cleanUpOldDecryptedMedias, startCleanUpMedia ? cleanUpMediasInterval : null); useFetchLatestReleaseFromFileServer(); diff --git a/ts/mains/main_node.ts b/ts/mains/main_node.ts index 80fb672db..a3c018bda 100644 --- a/ts/mains/main_node.ts +++ b/ts/mains/main_node.ts @@ -1025,10 +1025,12 @@ ipc.on('get-start-in-tray', event => { }); ipcMain.on('update-badge-count', (_event, count) => { - if (count === 0) { - app.setBadgeCount(0); // Clear the badge - } else { - app.setBadgeCount(count); // Set the badge count + if (app.isReady()) { + if (count === 0) { + app.setBadgeCount(0); // Clear the badge + } else { + app.setBadgeCount(count); // Set the badge count + } } }); From 78935dacdfc6c13c37e910cbf537bb17f2b588fd Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 20 Sep 2024 15:18:09 +1000 Subject: [PATCH 03/19] chore: removes unnecessary comments --- ts/components/leftpane/ActionsPanel.tsx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index 1a8d8cb31..bba9b0bce 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -217,12 +217,6 @@ const doAppStartUp = async () => { }, 20000); }; -// global.setTimeout(() => { -// const unreadMessageCount = useSelector(getGlobalUnreadMessageCount); -// // Send the calculated count to the main process to update the badge count -// ipcRenderer.send('update-badge-count', unreadMessageCount); -// }, 3000); - /** * ActionsPanel is the far left banner (not the left pane). * The panel with buttons to switch between the message/contact/settings/theme views From 72940c6221e245ca44a7ba2c1b83c2780950ff83 Mon Sep 17 00:00:00 2001 From: yougotwill Date: Fri, 25 Oct 2024 14:47:29 +1100 Subject: [PATCH 04/19] fix: dont use white for the copy url button in the modal --- ts/components/dialog/OpenUrlModal.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/ts/components/dialog/OpenUrlModal.tsx b/ts/components/dialog/OpenUrlModal.tsx index db5ff30f9..de729a32d 100644 --- a/ts/components/dialog/OpenUrlModal.tsx +++ b/ts/components/dialog/OpenUrlModal.tsx @@ -61,7 +61,6 @@ export function OpenUrlModal(props: OpenUrlModalState) { /> Date: Fri, 8 Nov 2024 13:58:43 +1100 Subject: [PATCH 05/19] Update ts/mains/main_node.ts Co-authored-by: Audric Ackermann --- ts/mains/main_node.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ts/mains/main_node.ts b/ts/mains/main_node.ts index a3c018bda..8c7f63a1d 100644 --- a/ts/mains/main_node.ts +++ b/ts/mains/main_node.ts @@ -1026,11 +1026,7 @@ ipc.on('get-start-in-tray', event => { ipcMain.on('update-badge-count', (_event, count) => { if (app.isReady()) { - if (count === 0) { - app.setBadgeCount(0); // Clear the badge - } else { - app.setBadgeCount(count); // Set the badge count - } + app.setBadgeCount(isNumber(count) && isFinite(count) && count >= 0 ? count : 0); } }); From 61c91be91ce642ea8778d71ad2f17e5fb2edda7d Mon Sep 17 00:00:00 2001 From: wafflesvsfrankie <92288602+burtonemily@users.noreply.github.com> Date: Fri, 8 Nov 2024 14:48:27 +1100 Subject: [PATCH 06/19] fix: addresses feedback --- ts/components/leftpane/ActionsPanel.tsx | 15 ++++++++++----- ts/state/selectors/conversations.ts | 4 +--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index bba9b0bce..62635a602 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -5,6 +5,7 @@ import { useEffect, useRef, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import useInterval from 'react-use/lib/useInterval'; import useTimeoutFn from 'react-use/lib/useTimeoutFn'; +import { useThrottleFn } from 'react-use'; import { Data } from '../../data/data'; import { getConversationController } from '../../session/conversations'; @@ -243,11 +244,15 @@ export const ActionsPanel = () => { const unreadToShow = globalUnreadMessageCount; // Reuse the unreadToShow from the global state to update the badge count - useEffect(() => { - if (unreadToShow !== undefined) { - ipcRenderer.send('update-badge-count', unreadToShow); - } - }, [unreadToShow]); + useThrottleFn( + () => { + if (unreadToShow !== undefined) { + ipcRenderer.send('update-badge-count', unreadToShow); + } + }, + 2000, + [] + ); useInterval(cleanUpOldDecryptedMedias, startCleanUpMedia ? cleanUpMediasInterval : null); diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 336d02ed4..5473c6e55 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -306,9 +306,7 @@ const _getContacts = ( }); }; -export const _getGlobalUnreadCount = ( - sortedConversations: Array -): number => { +const _getGlobalUnreadCount = (sortedConversations: Array): number => { let globalUnreadCount = 0; for (const conversation of sortedConversations) { // Blocked conversation are now only visible from the settings, not in the conversation list, so don't add it neither to the contacts list nor the conversation list From 948e5df6fd1de1004e4481cd6f88327c088bc723 Mon Sep 17 00:00:00 2001 From: wafflesvsfrankie <92288602+burtonemily@users.noreply.github.com> Date: Fri, 8 Nov 2024 14:53:54 +1100 Subject: [PATCH 07/19] fix: updates import for useThrottleFn --- ts/components/leftpane/ActionsPanel.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index 62635a602..2279c06cc 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -5,7 +5,7 @@ import { useEffect, useRef, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import useInterval from 'react-use/lib/useInterval'; import useTimeoutFn from 'react-use/lib/useTimeoutFn'; -import { useThrottleFn } from 'react-use'; +import useThrottleFn from 'react-use/lib/useThrottleFn'; import { Data } from '../../data/data'; import { getConversationController } from '../../session/conversations'; From 1caf0fe03ae5566a78086dc812a85918d8d9e31f Mon Sep 17 00:00:00 2001 From: wafflesvsfrankie <92288602+burtonemily@users.noreply.github.com> Date: Fri, 8 Nov 2024 15:40:51 +1100 Subject: [PATCH 08/19] fix: addresses feedback --- ts/components/leftpane/ActionsPanel.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index 2279c06cc..1d6021434 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -241,13 +241,12 @@ export const ActionsPanel = () => { }, []); const globalUnreadMessageCount = useSelector(getGlobalUnreadMessageCount); - const unreadToShow = globalUnreadMessageCount; // Reuse the unreadToShow from the global state to update the badge count useThrottleFn( () => { - if (unreadToShow !== undefined) { - ipcRenderer.send('update-badge-count', unreadToShow); + if (globalUnreadMessageCount !== undefined) { + ipcRenderer.send('update-badge-count', globalUnreadMessageCount); } }, 2000, From df3ac5d0fafc4683585173e598ed0370c9c055fa Mon Sep 17 00:00:00 2001 From: wafflesvsfrankie <92288602+burtonemily@users.noreply.github.com> Date: Fri, 8 Nov 2024 15:49:00 +1100 Subject: [PATCH 09/19] fix: fixes invalid isNumber and isFinite function --- ts/mains/main_node.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ts/mains/main_node.ts b/ts/mains/main_node.ts index 8c7f63a1d..5e04ee5bb 100644 --- a/ts/mains/main_node.ts +++ b/ts/mains/main_node.ts @@ -1026,7 +1026,9 @@ ipc.on('get-start-in-tray', event => { ipcMain.on('update-badge-count', (_event, count) => { if (app.isReady()) { - app.setBadgeCount(isNumber(count) && isFinite(count) && count >= 0 ? count : 0); + app.setBadgeCount( + typeof count === 'number' && Number.isFinite(count) && count >= 0 ? count : 0 + ); } }); From 81fbf35a32ca45497ff5c7872b8302c2efe46da0 Mon Sep 17 00:00:00 2001 From: wafflesvsfrankie <92288602+burtonemily@users.noreply.github.com> Date: Fri, 8 Nov 2024 16:55:59 +1100 Subject: [PATCH 10/19] fix: adds in globalUnreadMessageCount into the dependency array for useThrottleFn --- ts/components/leftpane/ActionsPanel.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index 1d6021434..4a67bc81b 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -244,13 +244,13 @@ export const ActionsPanel = () => { // Reuse the unreadToShow from the global state to update the badge count useThrottleFn( - () => { + (unreadCount: number) => { if (globalUnreadMessageCount !== undefined) { - ipcRenderer.send('update-badge-count', globalUnreadMessageCount); + ipcRenderer.send('update-badge-count', unreadCount); } }, 2000, - [] + [globalUnreadMessageCount] ); useInterval(cleanUpOldDecryptedMedias, startCleanUpMedia ? cleanUpMediasInterval : null); From ca81a50aef8f9dc6ff940e5df2993c4f47a64668 Mon Sep 17 00:00:00 2001 From: wafflesvsfrankie <92288602+burtonemily@users.noreply.github.com> Date: Mon, 11 Nov 2024 09:43:18 +1100 Subject: [PATCH 11/19] fix: adds isFinite and isNumber from lodash --- ts/mains/main_node.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ts/mains/main_node.ts b/ts/mains/main_node.ts index 5e04ee5bb..abc8ef65c 100644 --- a/ts/mains/main_node.ts +++ b/ts/mains/main_node.ts @@ -27,7 +27,7 @@ import { platform as osPlatform } from 'process'; import url from 'url'; import Logger from 'bunyan'; -import _, { isEmpty } from 'lodash'; +import _, { isEmpty, isNumber, isFinite } from 'lodash'; import pify from 'pify'; import { setupGlobalErrorHandler } from '../node/global_errors'; // checked - only node @@ -1027,7 +1027,7 @@ ipc.on('get-start-in-tray', event => { ipcMain.on('update-badge-count', (_event, count) => { if (app.isReady()) { app.setBadgeCount( - typeof count === 'number' && Number.isFinite(count) && count >= 0 ? count : 0 + isNumber(count) && isFinite(count) && count >= 0 ? count : 0 ); } }); From fc20bafde38408a57239345b1ebf2a7e676ad5dd Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 4 Dec 2024 09:56:57 +1100 Subject: [PATCH 12/19] fix: send approved message only when previously unapproved --- ts/interactions/conversationInteractions.ts | 2 +- ts/session/utils/calling/CallManager.ts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 5f0265292..ab483c60d 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -91,7 +91,7 @@ export async function unblockConvoById(conversationId: string) { export const approveConvoAndSendResponse = async (conversationId: string) => { const convoToApprove = getConversationController().get(conversationId); - if (!convoToApprove) { + if (!convoToApprove || convoToApprove.isApproved()) { window?.log?.info('Conversation is already approved.'); return; } diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts index 862b40919..62fa76d2b 100644 --- a/ts/session/utils/calling/CallManager.ts +++ b/ts/session/utils/calling/CallManager.ts @@ -35,6 +35,7 @@ import { MessageSender } from '../../sending'; import { getIsRinging } from '../RingingManager'; import { getBlackSilenceMediaStream } from './Silence'; import { ed25519Str } from '../String'; +import { sleepFor } from '../Promise'; export type InputItem = { deviceId: string; label: string }; @@ -534,6 +535,10 @@ export async function USER_callRecipient(recipient: string) { calledConvo.set('active_at', Date.now()); // addSingleOutgoingMessage does the commit for us on the convo await calledConvo.unhideIfNeeded(false); weAreCallerOnCurrentCall = true; + // Not ideal, but also temporary (see you in 2 years). + // We need to make sure the preoffer AND the messageRequestResponse sent in + // approveConvoAndSendResponse have different timestamps, as iOS will throw an error otherwise + await sleepFor(2); // initiating a call is analogous to sending a message request await approveConvoAndSendResponse(recipient); From 953c0738f9200938e6284c1486a6334102885aa1 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 4 Dec 2024 10:23:06 +1100 Subject: [PATCH 13/19] chore: bump release 1.14.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 063968495..ea3e888e4 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "session-desktop", "productName": "Session", "description": "Private messaging from your desktop", - "version": "1.14.1", + "version": "1.14.3", "license": "GPL-3.0", "author": { "name": "Oxen Labs", From c508757eba4cf76ba9277ef13534dce911551414 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 4 Dec 2024 10:27:00 +1100 Subject: [PATCH 14/19] chore: use gh runner image macos-13 as macos-12 is deprecated, and sometimes hang for 1h doing nothing --' --- .github/workflows/build-binaries.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 1d39adeae..d69055f05 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -118,7 +118,7 @@ jobs: # We want a mac arm64 build, and according to this https://github.com/actions/runner-images#available-images macos-14 is always arm64 # macos-14 is disabled for now as we hit our free tier limit for macos builds build_macos_x64: - runs-on: macos-12 + runs-on: macos-13 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} MAC_CERTIFICATE: ${{ secrets.MAC_CERTIFICATE }} From a9ff414fabe46e214acd67466b0c8712d7b75e16 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 4 Dec 2024 10:49:52 +1100 Subject: [PATCH 15/19] chore: change repository url to session-foundation --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ea3e888e4..6ddbd3d53 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/oxen-io/session-desktop.git" + "url": "https://github.com/session-foundation/session-desktop.git" }, "main": "ts/mains/main_node.js", "resolutions": { From 61eaf51f1a6315375c4c359ac6e6b19151a0d4cd Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 5 Dec 2024 14:12:24 +1100 Subject: [PATCH 16/19] chore: test with macos new certs --- .github/workflows/build-binaries.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 0f7b35dab..02739758b 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -121,10 +121,10 @@ jobs: runs-on: macos-13 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - MAC_CERTIFICATE: ${{ secrets.MAC_CERTIFICATE }} - MAC_CERTIFICATE_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD }} - SIGNING_APPLE_ID: ${{ secrets.SIGNING_APPLE_ID }} - SIGNING_APP_PASSWORD: ${{ secrets.SIGNING_APP_PASSWORD }} + MAC_CERTIFICATE: ${{ secrets.MAC_CERTIFICATE_2 }} + MAC_CERTIFICATE_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD_2 }} + SIGNING_APPLE_ID: ${{ secrets.SIGNING_APPLE_ID_2 }} + SIGNING_APP_PASSWORD: ${{ secrets.SIGNING_APP_PASSWORD_2 }} SIGNING_TEAM_ID: ${{ secrets.SIGNING_TEAM_ID }} steps: - run: git config --global core.autocrlf false From c595571ef49da51cdd912b4a7f2515884bf74d8c Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 5 Dec 2024 16:32:55 +1100 Subject: [PATCH 17/19] Revert "chore: test with macos new certs" This reverts commit 61eaf51f1a6315375c4c359ac6e6b19151a0d4cd. --- .github/workflows/build-binaries.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 02739758b..0f7b35dab 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -121,10 +121,10 @@ jobs: runs-on: macos-13 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - MAC_CERTIFICATE: ${{ secrets.MAC_CERTIFICATE_2 }} - MAC_CERTIFICATE_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD_2 }} - SIGNING_APPLE_ID: ${{ secrets.SIGNING_APPLE_ID_2 }} - SIGNING_APP_PASSWORD: ${{ secrets.SIGNING_APP_PASSWORD_2 }} + MAC_CERTIFICATE: ${{ secrets.MAC_CERTIFICATE }} + MAC_CERTIFICATE_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD }} + SIGNING_APPLE_ID: ${{ secrets.SIGNING_APPLE_ID }} + SIGNING_APP_PASSWORD: ${{ secrets.SIGNING_APP_PASSWORD }} SIGNING_TEAM_ID: ${{ secrets.SIGNING_TEAM_ID }} steps: - run: git config --global core.autocrlf false From 368106711f4f9e405894e2a8b90e3412ab11f450 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 5 Dec 2024 17:22:44 +1100 Subject: [PATCH 18/19] chore: try by removing node-gyp install on windows --- actions/setup_and_build/action.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/actions/setup_and_build/action.yml b/actions/setup_and_build/action.yml index 5c51a5146..67dae5f09 100644 --- a/actions/setup_and_build/action.yml +++ b/actions/setup_and_build/action.yml @@ -22,12 +22,6 @@ runs: uses: microsoft/setup-msbuild@v2 if: runner.os == 'Windows' - - name: Setup node for windows - if: runner.os == 'Windows' - shell: bash - run: | - yarn global add node-gyp@latest - - uses: actions/cache/restore@v4 id: cache-desktop-modules with: From ea0d5e16151297f7c27a3a41e91ab0da4da39991 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 5 Dec 2024 17:34:38 +1100 Subject: [PATCH 19/19] chore: happy to say node-gyp is not needed for windows anymore --- INTERNALBUILDS.md | 1 - 1 file changed, 1 deletion(-) diff --git a/INTERNALBUILDS.md b/INTERNALBUILDS.md index 8ab1b3db4..9858a0237 100644 --- a/INTERNALBUILDS.md +++ b/INTERNALBUILDS.md @@ -80,7 +80,6 @@ Building on windows should work straight out of the box, but if it fails then yo ``` npm install --global --production windows-build-tools@4.0.0 -npm install --global node-gyp@latest npm config set python python2.7 npm config set msvs_version 2015 ```