From 4a1e34d3b17cba5f01b0e4fba8d9d19deb572e98 Mon Sep 17 00:00:00 2001 From: yougotwill Date: Wed, 28 Aug 2024 15:08:32 +1000 Subject: [PATCH 1/6] chore: update package.json version to 1.13.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 85ad90fad..eb923bb2f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "session-desktop", "productName": "Session", "description": "Private messaging from your desktop", - "version": "1.13.1", + "version": "1.13.2", "license": "GPL-3.0", "author": { "name": "Oxen Labs", From 866e012730e341fb210d527d731bdd8908e33844 Mon Sep 17 00:00:00 2001 From: yougotwill Date: Wed, 28 Aug 2024 15:22:26 +1000 Subject: [PATCH 2/6] feat: update apple silicon min version is macos 14 this is due to the gh actions requirements for arm64 builds --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b78362283..f7ad9a9a1 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Please search for any [existing issues](https://github.com/oxen-io/session-deskt ## Supported platforms -Session requires Windows 10 or later, macOS Monterey (12) or later, or a linux distribution with glibc 2.28 or later like Debian 10 or Ubuntu 20.04. +Session requires Windows 10 or later, macOS Monterey (12) or later (Intel) or macOS Big Sur (14) or later (Apple Silicon), or a Linux distribution with glibc 2.28 or later like Debian 10 or Ubuntu 20.04. ## Build instruction From ce262d5617d12a664f9f77204bf3d96b8b1868af Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 28 Aug 2024 16:14:50 +1000 Subject: [PATCH 3/6] fix: tests --- .../unit/utils/job_runner/JobRunner_test.ts | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts index 1c6d0ef70..72bfc70a4 100644 --- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts +++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts @@ -26,6 +26,8 @@ function getFakeSleepForJobPersisted(timestamp: number): FakeSleepJobData { return getFakeSleepForJob(timestamp).serializeJob(); } +const multiJobSleepDuration = 5000; + function getFakeSleepForMultiJob({ timestamp, identifier, @@ -41,7 +43,7 @@ function getFakeSleepForMultiJob({ nextAttemptTimestamp: timestamp || 3000, currentRetry: 0, returnResult: isUndefined(returnResult) ? true : returnResult, - sleepDuration: 5000, + sleepDuration: multiJobSleepDuration, }); return job; } @@ -388,7 +390,7 @@ describe('JobRunner', () => { it('does await if there are jobs and one is started', async () => { await runnerMulti.loadJobsFromDb(); - const job = getFakeSleepForMultiJob({ timestamp: 100, returnResult: false }); // this job keeps failing + const job = getFakeSleepForMultiJob({ timestamp: 100, returnResult: false }); // this job keeps failing, on purpose runnerMulti.startProcessing(); clock.tick(110); // job should be started right away @@ -396,27 +398,28 @@ describe('JobRunner', () => { expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob()]); expect(result).to.eq('job_started'); - clock.tick(5010); + // the job takes 5 fake seconds, tick a bit less than that and then wait for it to finish + clock.tick(multiJobSleepDuration - 100); await runnerMulti.waitCurrentJob(); const jobUpdated = { ...job.serializeJob(), - nextAttemptTimestamp: clock.now + 10000, + nextAttemptTimestamp: clock.now + job.persistedData.delayBetweenRetries, currentRetry: 1, }; - // just give time for the runnerMulti to pick up a new job - await sleepFor(100); + // just give time for the runnerMulti to sort out the job finishing + await sleepFor(10); - // the job failed, so the job should still be there + // the job failed, so the job should still be there with a currentRetry of 1 expect(runnerMulti.getJobList()).to.deep.eq([jobUpdated]); - // that job should be retried now - clock.tick(11000); - await runner.waitCurrentJob(); + // job should have been rescheduled after 10s, so if we tick 10000 + 4900ms, we should have that job about to be done again + clock.tick(job.persistedData.delayBetweenRetries + multiJobSleepDuration - 100); await runnerMulti.waitCurrentJob(); + await sleepFor(10); const jobUpdated2 = { ...job.serializeJob(), - nextAttemptTimestamp: clock.now + job.persistedData.delayBetweenRetries, + nextAttemptTimestamp: clock.now + job.persistedData.delayBetweenRetries - 20, // the 20 is for the sleepFor we had earlier currentRetry: 2, }; @@ -425,11 +428,9 @@ describe('JobRunner', () => { expect(runnerMulti.getJobList()).to.deep.eq([jobUpdated2]); // that job should be retried one more time and then removed from the list of jobs to be run - clock.tick(11000); + clock.tick(job.persistedData.delayBetweenRetries + multiJobSleepDuration - 100); await runnerMulti.waitCurrentJob(); await sleepFor(10); - - await runnerMulti.waitCurrentJob(); expect(runnerMulti.getJobList()).to.deep.eq([]); }); }); From 10596132ca7c94becd3261e51cad697b30002e4c Mon Sep 17 00:00:00 2001 From: yougotwill Date: Thu, 29 Aug 2024 13:56:40 +1000 Subject: [PATCH 4/6] fix: revert supported platforms need to investigate auto updating before releasing arm64 macos builds. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f7ad9a9a1..f6b25c6a6 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Please search for any [existing issues](https://github.com/oxen-io/session-deskt ## Supported platforms -Session requires Windows 10 or later, macOS Monterey (12) or later (Intel) or macOS Big Sur (14) or later (Apple Silicon), or a Linux distribution with glibc 2.28 or later like Debian 10 or Ubuntu 20.04. +Session requires Windows 10 or later, macOS Monterey (12) or later, or a Linux distribution with glibc 2.29 or later like Debian 10 or Ubuntu 20.04. ## Build instruction From bfbec4f107ed104959813e0a7cc0f4d7dd905ad0 Mon Sep 17 00:00:00 2001 From: Will G Date: Thu, 29 Aug 2024 13:59:23 +1000 Subject: [PATCH 5/6] Update README.md use correct glibc --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f6b25c6a6..f33e765d1 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Please search for any [existing issues](https://github.com/oxen-io/session-deskt ## Supported platforms -Session requires Windows 10 or later, macOS Monterey (12) or later, or a Linux distribution with glibc 2.29 or later like Debian 10 or Ubuntu 20.04. +Session requires Windows 10 or later, macOS Monterey (12) or later, or a Linux distribution with glibc 2.28 or later like Debian 10 or Ubuntu 20.04. ## Build instruction From bb173540b346e3fe68137f244214a2864dbfe738 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 29 Aug 2024 14:17:31 +1000 Subject: [PATCH 6/6] fix: remove macos-14 from release until we fixed the auto updater --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 06a6a9214..4d5cfe22b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,8 +12,7 @@ jobs: strategy: fail-fast: false matrix: - # We want a mac arm64 build, and according to this https://github.com/actions/runner-images#available-images macos-14 is always arm64 - os: [windows-2022, ubuntu-20.04, macos-12, macos-14] + os: [windows-2022, ubuntu-20.04, macos-12] env: SIGNAL_ENV: production GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}