Skip to content

Commit

Permalink
Fix installers (Chia-Network#9378)
Browse files Browse the repository at this point in the history
* Update GUI back to main

* Pin specific versions of electron-package and electron-osx-sign

* Make sure ssh git urls actually use https

* Update azure pipeline to use https instead of ssh for git

* Update windows pipelines to use https instead of ssh

* Fix messed up insteadOf rules on windows + azure mac pipeline
  • Loading branch information
cmmarslender authored Nov 24, 2021
1 parent 7418142 commit 280cc7f
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build-linux-arm64-installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ jobs:
fetch-depth: 0
submodules: recursive

- uses: Chia-Network/actions/git-ssh-to-https@main

- name: Cleanup any leftovers that exist from previous runs
run: bash build_scripts/clean-runner.sh || true

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build-linux-installer-deb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ jobs:
fetch-depth: 0
submodules: recursive

- uses: Chia-Network/actions/git-ssh-to-https@main

- name: Cleanup any leftovers that exist from previous runs
run: bash build_scripts/clean-runner.sh || true

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build-linux-installer-rpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ jobs:
fetch-depth: 0
submodules: recursive

- uses: Chia-Network/actions/git-ssh-to-https@main

- name: Cleanup any leftovers that exist from previous runs
run: bash build_scripts/clean-runner.sh || true

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build-macos-installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ jobs:
fetch-depth: 0
submodules: recursive

- uses: Chia-Network/actions/git-ssh-to-https@main

- name: Cleanup any leftovers that exist from previous runs
run: bash build_scripts/clean-runner.sh || true

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build-macos-m1-installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ jobs:
fetch-depth: 0
submodules: recursive

- uses: Chia-Network/actions/git-ssh-to-https@main

- name: Cleanup any leftovers that exist from previous runs
run: bash build_scripts/clean-runner.sh || true

Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/build-windows-installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ jobs:
fetch-depth: 0
submodules: recursive

- name: Set git urls to https instead of ssh
run: |
git config --global url."https://github.com/".insteadOf ssh://[email protected]/
- name: Get npm cache directory
id: npm-cache
run: |
Expand Down Expand Up @@ -156,7 +160,6 @@ jobs:
name: Windows-Installers
path: ${{ github.workspace }}\chia-blockchain-gui\release-builds\


- name: Install AWS CLI
if: steps.check_secrets.outputs.HAS_AWS_SECRET
run: |
Expand Down
4 changes: 4 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ steps:
fetchDepth: 0
displayName: "Checkout code"

- script: |
git config --global url."https://github.com/".insteadOf ssh://[email protected]/
displayName: "Use https for git instead of ssh"
- task: UsePythonVersion@0
inputs:
versionSpec: "$(python.version)"
Expand Down
7 changes: 5 additions & 2 deletions build_scripts/build_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ echo "Chia Installer Version is: $CHIA_INSTALLER_VERSION"

echo "Installing npm and electron packagers"
npm install electron-installer-dmg -g
npm install electron-packager -g
npm install electron/electron-osx-sign -g
# Pinning electron-packager and electron-osx-sign to known working versions
# Current packager uses an old version of osx-sign, so if we install the newer sign package
# things break
npm install [email protected] -g
npm install [email protected] -g
npm install notarize-cli -g

echo "Create dist/"
Expand Down
7 changes: 5 additions & 2 deletions build_scripts/build_macos_m1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ echo "Chia Installer Version is: $CHIA_INSTALLER_VERSION"

echo "Installing npm and electron packagers"
npm install electron-installer-dmg -g
npm install electron-packager -g
npm install electron/electron-osx-sign -g
# Pinning electron-packager and electron-osx-sign to known working versions
# Current packager uses an old version of osx-sign, so if we install the newer sign package
# things break
npm install [email protected] -g
npm install [email protected] -g
npm install notarize-cli -g

echo "Create dist/"
Expand Down
2 changes: 1 addition & 1 deletion chia-blockchain-gui

0 comments on commit 280cc7f

Please sign in to comment.