Skip to content

Commit

Permalink
Bugfix 7555 / multiselect bug (#7556)
Browse files Browse the repository at this point in the history
* add python script to get latest

* add javascript to get latest

* add javascript to get latest versions of tCore

* change default upgrade of macos arm64 to universal

* got getLatestTcore.js working.  fixed versioning in getLatestTcore.py

* update unit tests for arm64 update

* update unit tests

* update wordAlignment

* update wordAlignment

---------

Co-authored-by: PhotoNomad0 <[email protected]>
  • Loading branch information
PhotoNomad0 and PhotoNomad0 authored Nov 8, 2023
1 parent 81a42f9 commit d1f76d8
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "translationCore",
"productName": "translationCore",
"version": "3.6.1",
"version": "3.6.2",
"minCompatibleVersion": "3.6.0",
"manifestVersion": "8",
"description": "A bridge between TS and TM",
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/CheckSoftwareUpdatesDialog.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ describe('Get update asset', () => {
tag_name: '2.0.0',
assets: [{
extra_info: 'bar',
name: 'translationCore-macos-x64-2.0.0.exe',
name: 'translationCore-macos-universal-2.0.0.exe',
}],
};
const expectedUpdate = {
extra_info: 'bar',
installed_version: '1.0.0',
name: 'translationCore-macos-x64-2.0.0.exe',
name: 'translationCore-macos-universal-2.0.0.exe',
latest_version: '2.0.0',
};
const expectedUpToDate = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export function getUpdateAsset(response, installedVersion, osArch, osPlatform) {
}

if (osArch === 'arm64') {
fallbackPlatform = `${platformNames[osPlatform]}-x64`;
fallbackPlatform = `${platformNames[osPlatform]}-universal`;
}

const platform = `${platformNames[osPlatform]}-${osArch}`;
Expand Down Expand Up @@ -207,7 +207,7 @@ class SoftwareUpdateDialogContainer extends React.Component {
if (!upToDate && (isLiteInstall_ !== isLiteRelease)) {
console.log(`found tagName ${tagName} which is a fallback install since isLiteRelease=${isLiteRelease}`, update);
const baseTagName = tagName.split('-')[0];
const sizeSuffix = isLiteRelease ? '-LITE' : '';
const sizeSuffix = isLiteInstall_ ? '-LITE' : '';
const rightTagName = baseTagName + sizeSuffix;
const tagUrl = `https://api.github.com/repos/unfoldingWord-dev/translationCore/releases/tags/${rightTagName}`;
console.log(`getting release ${rightTagName}`, update);
Expand Down
2 changes: 1 addition & 1 deletion src/tC_apps/wordAlignment

0 comments on commit d1f76d8

Please sign in to comment.