Skip to content

Commit

Permalink
Merge branch 'development' into core-covenants-integration
Browse files Browse the repository at this point in the history
* development: (28 commits)
  feat: covenants implementation (tari-project#3656)
  ci: add tor script to binaries bundle (tari-project#3689)
  chore: remove testnet reset todo in wallet (tari-project#3685)
  feat: dibbler new genesis block with faucet utxos (tari-project#3688)
  ci: fix clippy warning on generated proto module (tari-project#3690)
  test: fix metadata signature cucumber (tari-project#3687)
  refactor!: clean up #testnet reset TODOs (tari-project#3682)
  feat(comms)!: add signature to peer identity to allow third party identity updates (tari-project#3629)
  chore: remove moving lock.mdb (tari-project#3674)
  chore: merge weatherwax
  feat!: provide a compact form of TransactionInput (tari-project#3460)
  fix: allow 0-conf in blockchain db (tari-project#3680)
  v0.22.1.1
  v0.22.1
  ci: add build step (tari-project#3678)
  test: fix cucumber WalletQuery.feature (tari-project#3677)
  test: fix `wait for` step (tari-project#3673)
  fix: edge cases causing bans during header/block sync (tari-project#3661)
  perf(comms)!: optimise connection establishment (tari-project#3658)
  fix: end stale outbound queue immediately on disconnect, retry outbound messages (tari-project#3664)
  ...
  • Loading branch information
sdbondi committed Jan 11, 2022
2 parents 3209750 + 8dfcf3a commit d57329f
Show file tree
Hide file tree
Showing 405 changed files with 44,318 additions and 3,149 deletions.
55 changes: 19 additions & 36 deletions .github/workflows/base_node_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ on:

env:
TBN_FILENAME: "tari_base_node"
# PROTOC: protoc

jobs:
builds:
Expand Down Expand Up @@ -95,7 +94,6 @@ jobs:
libappindicator3-dev \
patchelf \
librsvg2-dev
# sudo apt-get -y upgrade
- name: Install macOS dependencies
if: startsWith(runner.os,'macOS')
run: brew install cmake zip coreutils
Expand All @@ -112,28 +110,30 @@ jobs:
echo "SHARUN=shasum --algorithm 256" >> $GITHUB_ENV
echo "CC=gcc" >> $GITHUB_ENV
echo "TBN_EXT=" >> $GITHUB_ENV
echo "S3DESTDIR=linux" >> $GITHUB_ENV
echo "SHELL_EXT=.sh" >> $GITHUB_ENV
echo "PLATFORM_SPECIFIC_DIR=linux" >> $GITHUB_ENV
echo "TBN_DIST=/dist" >> $GITHUB_ENV
- name: Set environment variables - macOS
if: startsWith(runner.os,'macOS')
run: |
echo "S3DESTDIR=osx" >> $GITHUB_ENV
echo "PLATFORM_SPECIFIC_DIR=osx" >> $GITHUB_ENV
- name: Set environment variables - Windows
if: startsWith(runner.os,'Windows')
shell: bash
run: |
echo "SHARUN=pwsh C:\ProgramData\chocolatey\lib\psutils\tools\psutils-master\shasum.ps1 --algorithm 256" >> $GITHUB_ENV
echo "TBN_EXT=.exe" >> $GITHUB_ENV
echo "SHELL_EXT=.bat" >> $GITHUB_ENV
echo "TBN_DIST=\dist" >> $GITHUB_ENV
echo "S3DESTDIR=windows" >> $GITHUB_ENV
echo "PLATFORM_SPECIFIC_DIR=windows" >> $GITHUB_ENV
echo "SQLITE3_LIB_DIR=C:\vcpkg\installed\x64-windows\lib" >> $GITHUB_ENV
echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >> $GITHUB_ENV
echo "LIBCLANG_PATH=C:\Program Files\LLVM\bin" >> $GITHUB_ENV
echo "C:\Strawberry\perl\bin" >> $GITHUB_PATH
- name: Caching
- name: Cache cargo files and outputs
uses: actions/cache@v2
with:
path: |
Expand All @@ -142,44 +142,27 @@ jobs:
target
key: ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}

- name: Compile react (collectibles)
- name: Compile launchpad GUI
run: |
cd applications/launchpad/gui-vue
npm install
npm run build
- name: Compile collectibles GUI
run: |
cd applications/tari_collectibles/web-app
npm install
npm run build
- name: Build binaries
- name: Build rust binaries
env:
RUSTFLAGS: "-C target_cpu=${{ matrix.target_cpu }}"
ROARING_ARCH: "${{ matrix.target_cpu }}"
run: |
echo "Cache Key: ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}"
#cd applications/tari_base_node
#cargo build --release --bin tari_base_node --features ${{ matrix.features}}
cargo build --release
# - name: Build tauri apps
# env:
# RUSTFLAGS: "-C target_cpu=${{ matrix.target_cpu }}"
# run: |
# echo "Cache Key: ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}"
# cd applications/tari_collectibles
# npm install
# cd web-app
# npm install
# cd ..
# npm run tauri build

# - name: Prepare Archives
# - name: Prepare Archives
# shell: bash
# run: |
# ls -la "$GITHUB_WORKSPACE"
# mkdir -p "$GITHUB_WORKSPACE${TBN_DIST}/archives"
# export distDir="$GITHUB_WORKSPACE${TBN_DIST}/archives"
# "$GITHUB_WORKSPACE/scripts/build_dists_tarball.sh" noBuild

- name: Prepare binaries
- name: Copy binaries to folder for zipping
shell: bash
run: |
mkdir -p "$GITHUB_WORKSPACE${TBN_DIST}"
Expand All @@ -189,18 +172,18 @@ jobs:
echo "Sha: ${VSHA_SHORT}"
echo "VERSION=${VERSION}" >> $GITHUB_ENV
echo "VSHA_SHORT=${VSHA_SHORT}" >> $GITHUB_ENV
#BINFILE="${TBN_FILENAME}-${VERSION}-${VSHA_SHORT}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}${TBN_EXT}"
BINFILE="${TBN_FILENAME}-${VERSION}-${VSHA_SHORT}-${{ matrix.os }}-${{ matrix.target_cpu }}${TBN_EXT}"
echo "BINFILE=${BINFILE}" >> $GITHUB_ENV
echo "Copying files for ${BINFILE} to $(pwd)"
#cp -v "$GITHUB_WORKSPACE/target/release/${TBN_FILENAME}${TBN_EXT}" "./${BINFILE}"
ls -la "$GITHUB_WORKSPACE/target/release/"
cp -v "$GITHUB_WORKSPACE/target/release/tari_base_node${TBN_EXT}" .
cp -v "$GITHUB_WORKSPACE/target/release/tari_console_wallet${TBN_EXT}" .
cp -v "$GITHUB_WORKSPACE/target/release/tari_merge_mining_proxy${TBN_EXT}" .
cp -v "$GITHUB_WORKSPACE/target/release/tari_mining_node${TBN_EXT}" .
cp -v "$GITHUB_WORKSPACE/target/release/tari_validator_node${TBN_EXT}" .
cp -v "$GITHUB_WORKSPACE/target/release/tari_collectibles${TBN_EXT}" .
cp -v "$GITHUB_WORKSPACE/target/release/tari_launchpad${TBN_EXT}" .
cp -v "$GITHUB_WORKSPACE/applications/tari_base_node/${PLATFORM_SPECIFIC_DIR}/runtime/start_tor${SHELL_EXT}" .
- name: Build the macos pkg
if: startsWith(runner.os,'macOS')
Expand Down Expand Up @@ -304,7 +287,7 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
SOURCE: "${{ github.workspace }}${{ env.TBN_DIST }}"
DEST_DIR: "${{ env.S3DESTOVERRIDE }}${{ env.S3DESTDIR }}/"
DEST_DIR: "${{ env.S3DESTOVERRIDE }}${{ env.PLATFORM_SPECIFIC_DIR }}/"
S3CMD: "cp"
S3OPTIONS: '--recursive --exclude "*" --include "*.zip*"'
# S3OPTIONS: '--recursive --exclude "*" --include "*.zip*"'
Expand Down Expand Up @@ -340,7 +323,7 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
SOURCE: "${{ github.workspace }}${{ env.TBN_DIST }}"
DEST_DIR: "${{ env.S3DESTOVERRIDE }}${{ env.S3DESTDIR }}/"
DEST_DIR: "${{ env.S3DESTOVERRIDE }}${{ env.PLATFORM_SPECIFIC_DIR }}/"
S3CMD: "cp"
S3OPTIONS: '--recursive --exclude "*" --include "*.zip*"'
# S3OPTIONS: '--recursive --exclude "*" --include "*.zip*"'
Expand Down
77 changes: 76 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ name: CI
env:
CARGO_HTTP_MULTIPLEXING: false
PROTOC: protoc
toolchain: nightly-2021-09-18
toolchain: nightly-2021-11-20

jobs:
clippy:
Expand Down Expand Up @@ -66,6 +66,11 @@ jobs:
with:
command: fmt
args: --all -- --check
- name: Compile NPM
run: |
cd applications/launchpad/gui-vue
npm install
npm run build
- name: Clippy check
uses: actions-rs/cargo@v1
with:
Expand Down Expand Up @@ -100,6 +105,28 @@ jobs:
~/.cargo/git
target
key: ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-${{ hashFiles('**/Cargo.lock') }}
- name: ubuntu dependencies
run: |
sudo apt-get update && \
sudo apt-get -y install \
build-essential \
libgtk-3-dev \
libwebkit2gtk-4.0-dev \
libsoup2.4-dev \
curl \
wget \
libappindicator3-dev \
patchelf \
librsvg2-dev \
libprotobuf-dev \
protobuf-compiler
- name: Compile NPM
run: |
cd applications/launchpad/gui-vue
npm install
npm run build
- name: toolchain
uses: actions-rs/toolchain@v1
with:
Expand All @@ -111,3 +138,51 @@ jobs:
with:
command: test
# args: --release
build:
name: build
runs-on: ubuntu-18.04
steps:
- name: checkout
uses: actions/checkout@v2
- name: Caching
uses: actions/cache@v2
with:
path: |
~/.cargo/registry
~/.cargo/git
target
key: ${{ runner.os }}-${{ runner.cpu-model }}-${{ env.toolchain }}-${{ hashFiles('**/Cargo.lock') }}
- name: ubuntu dependencies
run: |
sudo apt-get update && \
sudo apt-get -y install \
build-essential \
libgtk-3-dev \
libwebkit2gtk-4.0-dev \
libsoup2.4-dev \
curl \
wget \
libappindicator3-dev \
patchelf \
librsvg2-dev \
libprotobuf-dev \
protobuf-compiler
- name: Compile NPM
run: |
cd applications/launchpad/gui-vue
npm install
npm run build
- name: toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ env.toolchain }}
components: clippy, rustfmt
override: true

- name: cargo build
uses: actions-rs/cargo@v1
with:
command: check
args: --release --all-targets
Loading

0 comments on commit d57329f

Please sign in to comment.