Desktop release v2.14.23

.github/workflows/github-actions-main.yml

@@ -23,7 +23,7 @@ jobs:
       matrix:
         # Do not use unbuntu-latest because it causes `The operation was canceled` failures:
         # https://github.com/actions/runner-images/issues/6709
-        os: [macos-latest, ubuntu-20.04, windows-2019]
+        os: [macos-12, ubuntu-20.04, windows-2019]
     steps:
 
       # Trying to fix random networking issues on Windows

packages/app-desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "2.14.21",
+  "version": "2.14.23",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "private": true,

packages/lib/services/synchronizer/syncInfoUtils.ts

@@ -6,9 +6,6 @@ import { State } from '../../reducer';
 import { PublicPrivateKeyPair } from '../e2ee/ppk';
 import { MasterKeyEntity } from '../e2ee/types';
 import { compareVersions } from 'compare-versions';
-import { _ } from '../../locale';
-import JoplinError from '../../JoplinError';
-import { ErrorCode } from '../../errors';
 const fastDeepEqual = require('fast-deep-equal');
 
 const logger = Logger.create('syncInfoUtils');
@@ -427,6 +424,8 @@ export function masterKeyById(id: string) {
 	return localSyncInfo().masterKeys.find(mk => mk.id === id);
 }
 
-export const checkIfCanSync = (s: SyncInfo, appVersion: string) => {
-	if (compareVersions(appVersion, s.appMinVersion) < 0) throw new JoplinError(_('In order to synchronise, please upgrade your application to version %s+', s.appMinVersion), ErrorCode.MustUpgradeApp);
+export const checkIfCanSync = (_s: SyncInfo, _appVersion: string) => {
+	// Disabled to allow compatibility between 2.14 and 3.0 for users who can't upgrade
+
+	// if (compareVersions(appVersion, s.appMinVersion) < 0) throw new JoplinError(_('In order to synchronise, please upgrade your application to version %s+', s.appMinVersion), ErrorCode.MustUpgradeApp);
 };