Skip to content

Commit

Permalink
Fix bad version numbering from scm for installers (Chia-Network#1029)
Browse files Browse the repository at this point in the history
* Search for bad version numbering from scm

* pollution is in the sub repo. Dir to check

* test-cache fetch depth 1 - clean debug installers
  • Loading branch information
hoffmang9 authored Feb 24, 2021
1 parent 9edfe58 commit 2ef6872
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build-macos-installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,12 @@ jobs:
APPLE_NOTARIZE_PASSWORD: "${{ secrets.APPLE_NOTARIZE_PASSWORD }}"
run: |
. ./activate
clang --version
cd ./chia-blockchain-gui
npm install
npm audit fix
npm run locale:extract
npm run locale:compile
git status
cd ../build_scripts
sh build_macos.sh
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-test-macos-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ jobs:
repository: 'Chia-Network/test-cache'
path: '.chia'
ref: '0.12.0'
fetch-depth: 1

- name: Link home directory
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-test-macos-wallet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ jobs:
repository: 'Chia-Network/test-cache'
path: '.chia'
ref: '0.12.0'
fetch-depth: 1

- name: Link home directory
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-test-ubuntu-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ jobs:
repository: 'Chia-Network/test-cache'
path: '.chia'
ref: '0.12.0'
fetch-depth: 1

- name: Link home directory
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-test-ubuntu-wallet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ jobs:
repository: 'Chia-Network/test-cache'
path: '.chia'
ref: '0.12.0'
fetch-depth: 1

- name: Link home directory
run: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,4 @@ build_scripts/*.Dmg
chia-blockchain-gui/src/locales/_build
build_scripts\win_build
build_scripts/win_build
win_code_sign_cert.p12
10 changes: 9 additions & 1 deletion build_scripts/build_windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ $ErrorActionPreference = "Stop"
mkdir build_scripts\win_build
Set-Location -Path ".\build_scripts\win_build" -PassThru

git status

Write-Output " ---"
Write-Output "curl miniupnpc"
Write-Output " ---"
Expand Down Expand Up @@ -41,7 +43,6 @@ if (-not (Test-Path env:CHIA_INSTALLER_VERSION)) {
Write-Output "WARNING: No environment variable CHIA_INSTALLER_VERSION set. Using 0.0.0"
}
Write-Output "Chia Version is: $env:CHIA_INSTALLER_VERSION"
Write-Output "SCM Version is: $env:SCM_VERSION"
Write-Output " ---"

Write-Output " ---"
Expand Down Expand Up @@ -73,6 +74,8 @@ Write-Output " ---"
Copy-Item "dist\daemon" -Destination "..\chia-blockchain-gui\" -Recurse
Set-Location -Path "..\chia-blockchain-gui" -PassThru

git status

Write-Output " ---"
Write-Output "Prepare Electron packager"
Write-Output " ---"
Expand All @@ -82,6 +85,7 @@ npm install
npm run locale:extract
npm run locale:compile

git status

Write-Output " ---"
Write-Output "Electron package Windows Installer"
Expand Down Expand Up @@ -112,6 +116,8 @@ Write-Output "node winstaller.js"
node winstaller.js
Write-Output " ---"

git status

If ($env:HAS_SECRET) {
Write-Output " ---"
Write-Output "Add timestamp and verify signature"
Expand All @@ -122,6 +128,8 @@ If ($env:HAS_SECRET) {
Write-Output "Skipping timestamp and verify signatures - no authorization to install certificates"
}

git status

Write-Output " ---"
Write-Output "Windows Installer complete"
Write-Output " ---"

0 comments on commit 2ef6872

Please sign in to comment.