Fix versioning for 1.0.0, ping GUI, a little more installer time (Chi…

…a-Network#1356)
martinsv · Mar 18, 2021 · b833fde · b833fde
1 parent c42c531
commit b833fde
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/build-macos-installer.yml b/.github/workflows/build-macos-installer.yml
@@ -14,7 +14,7 @@ jobs:
   build:
     name: MacOS installer on Catalina and Python 3.8
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
+    timeout-minutes: 40
     strategy:
       fail-fast: false
       max-parallel: 4

diff --git a/.github/workflows/build-windows-installer.yml b/.github/workflows/build-windows-installer.yml
@@ -14,7 +14,7 @@ jobs:
   build:
     name: Windows Installer on Windows 10 and Python 3.7
     runs-on: [windows-latest]
-    timeout-minutes: 30
+    timeout-minutes: 40
 
     steps:
     - name: Cancel previous runs on the same branch

diff --git a/build_scripts/installer-version.py b/build_scripts/installer-version.py
@@ -44,6 +44,10 @@ def main():
         patch_release_number = original_minor_ver_list[1]
         if smc_patch_version and "dev" in smc_patch_version:
             dev_release_number = "." + smc_patch_version
+    elif len(version) == 2:
+        major_release_number = scm_major_version
+        minor_release_number = scm_minor_version
+        patch_release_number = "0"
     else:
         major_release_number = scm_major_version
         minor_release_number = scm_minor_version

diff --git a/chia-blockchain-gui b/chia-blockchain-gui
+1 −1		.linguirc
+343 −249		package-lock.json
+27 −27		package.json
+2 −2		src/components/block/Block.jsx
+1 −0		src/components/core/components/LocaleToggle/LocaleToggle.tsx
+4 −1		src/config/locales.js
+125 −127		src/electron-starter.js
+471 −301		src/locales/da/messages.po
+65 −63		src/locales/en/messages.po
+65 −63		src/locales/es/messages.po
+125 −123		src/locales/fi/messages.po
+65 −63		src/locales/it/messages.po
+765 −594		src/locales/ja/messages.po
+65 −63		src/locales/ro/messages.po
+65 −63		src/locales/ru/messages.po
+126 −124		src/locales/sk/messages.po
+65 −63		src/locales/sv/messages.po
+65 −63		src/locales/zh-CN/messages.po
+1 −1		src/util/toBech32m.ts