From bac2f49cf81b41ae59ed0420be96c42f6df3967a Mon Sep 17 00:00:00 2001 From: Jaifroid Date: Thu, 13 May 2021 07:49:53 +0100 Subject: [PATCH] Script changes for UWP app Former-commit-id: 732ab8e401a7fc0936276fc710cdf0d0744188e8 [formerly e1547957899efbfd9f57f229b916e5df1939dcfb] [formerly f89f99bc30b9d280152347a77cc26020c8121dd2] [formerly 448f497c0d0ac7f05397e2f5511480383503c14d [formerly 5f064297ef2d257c3650e1cebb0a5d239ad8fe65 [formerly 32b3e353722a6d46fb05a8c7a65f4af2ba94269a]]] Former-commit-id: 340ad6082f7f761bd215ceecbf0b8b7c4ecaaceb [formerly 41543c5ed0ffab07967ca76791a5bcdbe0ad4bf7 [formerly e6af5e8b041c695a5d8bdc7eff64c9681b96cc04]] Former-commit-id: 81cd7c3cb13b0ded33f0a644da064cf8eaaddc2f [formerly 6032583aa81bc3cad8956db91012704ef3f7b447] Former-commit-id: 6bdbbc119b10edcf2237ed69aa1f2cc7984a64b8 --- scripts/Create-DraftRelease.ps1 | 11 ++++++----- scripts/Kiwix_JS_WikiMed_Release_Body.md | 9 ++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/Create-DraftRelease.ps1 b/scripts/Create-DraftRelease.ps1 index cab13d46..470481f2 100644 --- a/scripts/Create-DraftRelease.ps1 +++ b/scripts/Create-DraftRelease.ps1 @@ -1,7 +1,7 @@ param ( [string]$tag_name = "", [switch]$dryrun = $false, - [switch]$usetestrelease = $false, + [switch]$usestorerelease = $false, [switch]$draftonly = $false ) @@ -97,7 +97,7 @@ if ($dryrun -or $release.assets_url -imatch '^https:') { "The draft release details were successfully created.`n" "Updating release version in package.json" $json_object = Get-Content -Raw "$PSScriptRoot/../package.json" - $json_object = $json_object -replace '("version": ")[^"]+', "`${1}$base_tag" + $json_object = $json_object -replace '("version": ")[^"]+', "`${1}$numeric_tag" if ($dryrun) { "[DRYRUN] would have written:`n" $json_object @@ -193,8 +193,9 @@ if ($dryrun -or $release.assets_url -imatch '^https:') { } } } else { - # If we are releasing a certified version we have to copy it from a different location - if (-Not $usetestrelease) { + # If we are releasing the MS Store version we have to copy it from a different location + if ($usestorerelease) { + "Using Store release becuase usestorerelease flag was set." $UploadBundle = dir "$PSScriptRoot/../bin/Release/Upload/*_$base_tag.0/*_$base_tag*.appx*" "$UploadBundle" if ($UploadBundle -and ($UploadBundle.count -eq 1) -and (Test-Path $UploadBundle -PathType leaf) -and ($UploadBundle -imatch '\.(?:appx|appxbundle|appxupload)$')) { @@ -209,7 +210,7 @@ if ($dryrun -or $release.assets_url -imatch '^https:') { "WARNING: Could not find the upload bundle, so we will use the test release..." } } else { - "Using test release because usetestrelease flag was set." + "Using locally signed release." } $ReleaseBundle = dir "$PSScriptRoot/../AppPackages/*_$base_tag*_Test/*_$base_tag*.appx*" # Check the file exists and it's of the right type diff --git a/scripts/Kiwix_JS_WikiMed_Release_Body.md b/scripts/Kiwix_JS_WikiMed_Release_Body.md index e4facae8..28d2c9c6 100644 --- a/scripts/Kiwix_JS_WikiMed_Release_Body.md +++ b/scripts/Kiwix_JS_WikiMed_Release_Body.md @@ -1,13 +1,12 @@ ## This is the WikiMed UWP release (for Store or manual installation) -It contains the <> release of the WikiMed ZIM together with the changes detailed in the [CHANGELOG](https://github.com/kiwix/kiwix-js-windows/blob/Kiwix-JS-WikiMed/CHANGELOG.md). +It contains the <> release of the WikiMed ZIM together with the changes detailed in the [CHANGELOG](https://github.com/kiwix/kiwix-js-windows/blob/Kiwix-JS-WikiMed/CHANGELOG.md). **If you are running an older version of Windows (7/8), or Linux (Ubuntu, Debian), then you can use the [WikiMed Electron version](https://kiwix.github.io/kiwix-js-windows/wikimed-electron.html) instead.** For Windows XP or Vista, we have the [NWJS release](https://kiwix.github.io/kiwix-js-windows/kiwix-js-nwjs.html) (separate archive download required for NWJS version). If you are running **Windows 10**, then it is easiest to install this app from the Store here: **Status of store app: IN CERTIFICATION** https://www.microsoft.com/store/apps/9PHJSNP1CZ8J -If you prefer not to use the Microsoft Store or wish to test a different build, please follow the -instructions below the screenshot. +The Store version will keep itself up-to-date, but if you prefer not to use the Microsoft Store or wish to test a different build, please follow the instructions below the screenshot. ![image](https://user-images.githubusercontent.com/4304337/107876789-192ba900-6ec0-11eb-8dcc-c1f7bc12b6f6.png) @@ -15,7 +14,7 @@ instructions below the screenshot. **Uninstall any previous installation of Kiwix JS WikiMed before you follow this procedure**. -Download the signed bundle [KiwixWebAppWikiMed_<>.0_AnyCPU.appxbundle](https://github.com/kiwix/kiwix-js-windows/releases/download/v<>-WikiMed/KiwixWebAppWikiMed_<>.0_AnyCPU.appxbundle) and run/launch it (depending on the browser, you may need to single-click or double-click the file or "download complete" notification). The App Installer should open and ask you whether you wish to install (it may also ask you if you wish to allow sideloading apps: if so, answer yes). If you are satisfied that the app is trusted, click Install. +Download the signed bundle [KiwixWebAppWikiMed_<>.0_AnyCPU.appxbundle](https://github.com/kiwix/kiwix-js-windows/releases/download/v<>-WikiMed/KiwixWebAppWikiMed_<>.0_AnyCPU.appxbundle) and run/launch it (depending on the browser, you may need to single-click or double-click the file or "download complete" notification). The App Installer should open and ask you whether you wish to install (it may also ask you if you wish to allow sideloading apps: if so, answer yes). If you are satisfied that the app is trusted, click Install. On slightly older versions of Windows 10, you may need to enable sideloading of apps beforehand: go to Settings / Update and security / For developers and select "Sideload apps". You may be asked to reboot. @@ -27,4 +26,4 @@ If the above procedures fail, or the App Installer is not available, then downlo Download [KiwixWebAppWikiMed_<>.0_AnyCPU.appxbundle](https://github.com/kiwix/kiwix-js-windows/releases/download/v<>-WikiMed/KiwixWebAppWikiMed_<>.0_AnyCPU.appxbundle) to your downloads folder, or other accessible folder, on the device. Enable Developer mode on your device (Settings / Updates and security / For developers). -Open the File Explorer on the phone, navigate to the downloads folder and tap the KiwixWebAppWikiMed bundle. You will be asked if you wish to install, but it then installs silently in the background. Be patient: it can take a minute or so for the WikiMed icon to appear in the All Apps list. \ No newline at end of file +Open the File Explorer on the phone, navigate to the downloads folder and tap the KiwixWebAppWikiMed bundle. You will be asked if you wish to install, but it then installs silently in the background. Be patient: it can take a minute or so for the WikiMed icon to appear in the All Apps list.