mirror of
https://github.com/Chia-Network/chia-blockchain.git
synced 2024-09-17 13:49:19 +03:00
Update MacOS ci, fix wallet error message (#258)
* Build Mac on py 3.7 only, fix wallet error message
This commit is contained in:
parent
5e81bac95e
commit
446ec9a3fd
@ -1,17 +1,18 @@
|
||||
name: Build Ubuntu and MacOS
|
||||
name: Build MacOS
|
||||
|
||||
|
||||
on: [push]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: Python 3.7 on macOS-latest
|
||||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
fail-fast: false
|
||||
max-parallel: 4
|
||||
matrix:
|
||||
python-version: [3.7, 3.8]
|
||||
os: [ubuntu-latest, macOS-latest]
|
||||
python-version: [3.7]
|
||||
os: [macOS-latest]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
@ -21,22 +22,13 @@ jobs:
|
||||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
|
||||
- name: Import app cert
|
||||
if: startsWith(matrix.os, 'mac')
|
||||
- name: Import Apple app signing certificate
|
||||
uses: Apple-Actions/import-codesign-certs@v1
|
||||
with:
|
||||
p12-file-base64: ${{ secrets.CERT_APP }}
|
||||
p12-password: ${{ secrets.CERT_PASS }}
|
||||
|
||||
- name: Install ubuntu dependencies
|
||||
if: startsWith(matrix.os, 'ubuntu')
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install python${{ matrix.python-version }}-venv python${{ matrix.python-version }}-distutils git -y
|
||||
sudo apt-get install nodejs-dev node-gyp
|
||||
|
||||
- name: Install Mac dependencies
|
||||
if: startsWith(matrix.os, 'mac')
|
||||
- name: Install MacOS dependencies
|
||||
run: |
|
||||
brew update
|
||||
|
||||
@ -66,17 +58,14 @@ jobs:
|
||||
./venv/bin/mypy src tests
|
||||
|
||||
- name: Setup kernel for react native, increase watchers
|
||||
if: startsWith(matrix.os, 'mac')
|
||||
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf
|
||||
|
||||
- name: Setup Node on OSX
|
||||
if: startsWith(matrix.os, 'mac')
|
||||
- name: Setup Node 12.x
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: '12.x'
|
||||
|
||||
- name: Build MacOS DMG in Catalina
|
||||
if: startsWith(matrix.os, 'mac')
|
||||
run: |
|
||||
. ./activate
|
||||
cd build_scripts
|
||||
@ -88,7 +77,6 @@ jobs:
|
||||
./venv/bin/py.test tests -s -v
|
||||
|
||||
- name: Upload MacOS artifacts
|
||||
if: startsWith(matrix.os, 'mac')
|
||||
uses: actions/upload-artifact@v1
|
||||
with:
|
||||
name: Chia-MacOS-10.15-dmg
|
59
.github/workflows/build-ubuntu.yml
vendored
Normal file
59
.github/workflows/build-ubuntu.yml
vendored
Normal file
@ -0,0 +1,59 @@
|
||||
name: Build Ubuntu on Python 3.7 and 3.8
|
||||
|
||||
|
||||
on: [push]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: Python 3.7 and 3.8 on ubuntu-latest
|
||||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
fail-fast: false
|
||||
max-parallel: 4
|
||||
matrix:
|
||||
python-version: [3.7, 3.8]
|
||||
os: [ubuntu-latest]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
|
||||
- name: Setup Python environment
|
||||
uses: actions/setup-python@v1.1.1
|
||||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
|
||||
- name: Install ubuntu dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install python${{ matrix.python-version }}-venv python${{ matrix.python-version }}-distutils git -y
|
||||
sudo apt-get install nodejs-dev node-gyp
|
||||
|
||||
- name: Run install script
|
||||
env:
|
||||
INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
|
||||
run: |
|
||||
sh install.sh
|
||||
|
||||
- name: Install timelord
|
||||
run: |
|
||||
. ./activate
|
||||
sh install-timelord.sh
|
||||
./vdf_bench square_asm 400000
|
||||
|
||||
- name: Install developer requirements
|
||||
run: |
|
||||
. ./activate
|
||||
venv/bin/python -m pip install -r requirements-dev.txt
|
||||
|
||||
- name: Lint source with flake8
|
||||
run: |
|
||||
./venv/bin/flake8 src
|
||||
|
||||
- name: Lint source with mypy
|
||||
run: |
|
||||
./venv/bin/mypy src tests
|
||||
|
||||
- name: Test blockchain code with pytest
|
||||
run: |
|
||||
. ./activate
|
||||
./venv/bin/py.test tests -s -v
|
@ -1,10 +1,10 @@
|
||||
name: Build Windows Installer
|
||||
name: Build Windows
|
||||
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: Build Windows Installer
|
||||
name: Python 3.7 on windows-latest
|
||||
runs-on: [windows-latest]
|
||||
|
||||
steps:
|
||||
@ -17,7 +17,7 @@ jobs:
|
||||
name: Install Python 3.7
|
||||
with:
|
||||
python-version: "3.7"
|
||||
|
||||
|
||||
- name: Add msbuild to PATH
|
||||
uses: microsoft/setup-msbuild@v1.0.0
|
||||
|
@ -49,6 +49,11 @@ steps:
|
||||
pip wheel --use-pep517 --only-binary cbor2 --extra-index-url https://download.chia.net/simple/ --wheel-dir=wheels .
|
||||
displayName: "Build wheels"
|
||||
|
||||
- task: NodeTool@0
|
||||
inputs:
|
||||
versionSpec: '12.x'
|
||||
displayName: "Setup Node 12.xß"
|
||||
|
||||
- script: |
|
||||
. ./activate
|
||||
cd ./electron-react
|
||||
@ -62,7 +67,7 @@ steps:
|
||||
pip install .
|
||||
displayName: "Install wheels"
|
||||
|
||||
# install-timelord.sh usually wants venv, but this clean runner is the "venv"
|
||||
# install-timelord.sh in venv
|
||||
- script: |
|
||||
. ./activate
|
||||
echo "which python"
|
||||
@ -72,16 +77,16 @@ steps:
|
||||
./vdf_bench square_asm 400000
|
||||
displayName: "Install timelord"
|
||||
|
||||
- script: |
|
||||
. ./activate
|
||||
python -m pip install -r requirements-dev.txt
|
||||
displayName: "Install dev dependencies"
|
||||
# - script: |
|
||||
# . ./activate
|
||||
# python -m pip install -r requirements-dev.txt
|
||||
# displayName: "Install dev dependencies"
|
||||
|
||||
- script: |
|
||||
. ./activate
|
||||
pip install pytest pytest-azurepipelines
|
||||
py.test tests -s -v
|
||||
displayName: "pytest"
|
||||
# - script: |
|
||||
# . ./activate
|
||||
# pip install pytest pytest-azurepipelines
|
||||
# py.test tests -s -v
|
||||
# displayName: "pytest"
|
||||
|
||||
- script: |
|
||||
. ./activate
|
||||
|
@ -31,7 +31,7 @@ pip install wheel
|
||||
pip install pywin32 pyinstaller
|
||||
|
||||
Write-Output " ---";
|
||||
Write-Output "Install chia-blockchain wheels into venv with install_win.py";
|
||||
Write-Output "Install chia-blockchain wheels into venv with pip";
|
||||
Write-Output " ---";
|
||||
|
||||
Write-Output "pip install miniupnpc";
|
||||
|
@ -316,7 +316,7 @@ class TradeManager:
|
||||
if zero_spend_bundle is None:
|
||||
return (
|
||||
False,
|
||||
"unable to generate zero value coin, check you have chia available",
|
||||
"Unable to generate zero value coin. Confirm that you have chia available",
|
||||
)
|
||||
zero_spend_list.append(zero_spend_bundle)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user