Skip to content

Commit

Permalink
Merge pull request #79 from Chinilla/dev
Browse files Browse the repository at this point in the history
Merge Dev into Latest
  • Loading branch information
edwardteach42 authored May 12, 2022
2 parents d57bf47 + 3ba61a9 commit 5310551
Show file tree
Hide file tree
Showing 117 changed files with 1,727 additions and 618 deletions.
9 changes: 5 additions & 4 deletions .github/workflows.disabled/build-macos-m1-installer.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name: MacOS M1 installer on Python 3.9
name: Build Installer - MacOS arm64

on:
push:
branches:
- main
- 'release/**'
tags:
- '**'
pull_request:
Expand All @@ -17,7 +18,7 @@ concurrency:

jobs:
build:
name: MacOS M1 installer on Python 3.9
name: MacOS arm64 installer
runs-on: [m1]
timeout-minutes: 40
strategy:
Expand Down Expand Up @@ -102,7 +103,7 @@ jobs:
env:
INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
run: |
arch -arm64 sh install.sh
arch -arm64 sh install.sh -d
- name: Install node 16.x
run: |
Expand All @@ -122,7 +123,7 @@ jobs:
arch -arm64 sh build_macos_m1.sh
- name: Upload MacOS artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: chinilla-installers-macos-dmg-arm64
path: ${{ github.workspace }}/build_scripts/final_installer/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-blockchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-clvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-core-cmds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-core-daemon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-core-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-core-ssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-core-util.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-plot_sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-plotting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-pools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-simulation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing
- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
Loading

0 comments on commit 5310551

Please sign in to comment.