Skip to content

Commit

Permalink
Resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
patnorris authored and patnorris committed Feb 12, 2024
2 parents cbb6b93 + d8c7c3d commit 7dbcd33
Show file tree
Hide file tree
Showing 19 changed files with 1,188 additions and 284 deletions.
2 changes: 2 additions & 0 deletions .github/trigger.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# A dummy file to trigger the workflow without making any actual change.
# Just change something arbitrary in this line, like a space .
80 changes: 80 additions & 0 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
name: cicd

on:
workflow_dispatch:
push:
paths:
- 'backend/*/src/**'
- 'backend/*/test/**'
- 'Makefile'
- '.github/trigger.txt'
- '.github/workflows/cicd.yml'

jobs:
all:
name: all
strategy:
matrix:
python-version: [3.11]
# python-version: [3.8, 3.11]
os: [ubuntu-latest]
# os: [ubuntu-latest, macos-latest] # first need to update toolchain installation

runs-on: ${{ matrix.os }}

steps:
# https://github.com/marketplace/actions/setup-miniconda
- uses: conda-incubator/setup-miniconda@v2
with:
python-version: ${{ matrix.python-version }}

# -------------------------------------------------------------------
- name: checkout repository
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Initialize submodules
run: |
git submodule update --init --recursive
# -------------------------------------------------------------------
- name: install
shell: bash -l {0} # activates the default conda environment ('test')
run: |
echo "Installing tool chains & dependencies"
pwd
sudo apt-get update
sudo apt-get install build-essential libssl-dev
sudo apt-get install -y wget tar
make install-dfx
make install-python
# make install-jp
# make install-nvm
# make install-nodejs
make install-mops
- name: Download and Install Bitcoin Core
run: |
make install-bitcoin-core
- name: versions
shell: bash -l {0}
run: |
echo "icpp --version: $(icpp --version)"
echo "pip version : $(pip --version)"
echo "python version : $(python --version)"
echo "jp version : $(jp --version)"
echo "dfx version : $(dfx --version)"
BITCOIN_DIR=$(find . -name "bitcoin-*" -type d | head -n 1)
$BITCOIN_DIR/bin/bitcoind -version
echo "Ensure conda works properly"
conda info
which pip
which python
which icpp
- name: all-tests
shell: bash -l {0}
run: |
make all-tests
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,7 @@ __pycache__/
*.pyc

# misc
.vscode/launch.json
.vscode/launch.json
bitcoin.tar.gz
bitcoin-*/
.DS_STORE
13 changes: 13 additions & 0 deletions .mypy.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# https://mypy.readthedocs.io/en/latest/config_file.html#config-file
# (-) python -m mypy --config-file FILENAME ...

# Global options:
[mypy]
disallow_untyped_calls = True
disallow_untyped_defs = True
disallow_incomplete_defs = True
check_untyped_defs = True
disallow_untyped_decorators = True
show_error_codes = True
warn_redundant_casts = True
warn_unused_ignores = True
Loading

0 comments on commit 7dbcd33

Please sign in to comment.