mirror of
https://github.com/Chia-Network/chia-blockchain.git
synced 2024-10-27 04:55:25 +03:00
Fix versioning for 1.0.0, ping GUI, a little more installer time (#1356)
This commit is contained in:
parent
c42c5312d7
commit
b833fde8ab
2
.github/workflows/build-macos-installer.yml
vendored
2
.github/workflows/build-macos-installer.yml
vendored
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 4a8e13e4b6789fe92a17a0afd2d3cfdbe2ffde3e
|
||||
Subproject commit b347e64e4240c012b090ed0e336854c6c65e55e7
|
Loading…
Reference in New Issue
Block a user