Skip to content

Commit

Permalink
Merge branch 'development' into comms-peer-manager-signed-peers
Browse files Browse the repository at this point in the history
* development: (77 commits)
  chore: merge development
  refactor: split transaction file (tari-project#3653)
  refactor: change transaction mod name
  chore: fix imports fmt (tari-project#3650)
  feat: add 721 template stub (tari-project#3643)
  feat: add transfer method to tip002 (tari-project#3632)
  feat: add connect per site into the web extension (tari-project#3626)
  refactor: fix db structure (tari-project#3616)
  feat: add asset key manager to collectibles (tari-project#3609)
  ci: update validator-node CI for faster feedback (tari-project#3606)
  feat: add state database (tari-project#3591)
  feat: add wallet stub to collectibles app (tari-project#3589)
  feat: add onboarding flow for web extension (tari-project#3582)
  feat: compile key manager to wasm and add javascript interface (tari-project#3565)
  feat: add storage to validator node (tari-project#3551)
  fix: wallet was not able to run (tari-project#3561)
  feat: add react popup with some basic functionality (tari-project#3550)
  feat: create tari web extension application stub (tari-project#3535)
  chore: merge dev
  refactor: move conversion
  ...
  • Loading branch information
sdbondi committed Dec 12, 2021
2 parents 7fd71d4 + 2f8bc35 commit 3abefcd
Show file tree
Hide file tree
Showing 638 changed files with 138,020 additions and 2,349 deletions.
4 changes: 4 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ commands:
name: Run cucumber scenarios
no_output_timeout: 20m
command: cd integration_tests && mkdir -p cucumber_output && node_modules/.bin/cucumber-js --profile "ci" --tags "@critical and not @long-running and not @broken and not @wallet-ffi" --format json:cucumber_output/tests.cucumber --exit --retry 3 --retry-tag-filter "@flaky and not @broken"
when: always
- run:
name: Generate report
command: cd integration_tests && node ./generate_report.js
Expand All @@ -63,6 +64,9 @@ commands:
- run:
name: Build base node
command: cargo build --release --bin tari_base_node
- run:
name: Build validator node
command: cargo build --release --bin tari_validator_node
- run:
name: Build wallet
command: cargo build --release --bin tari_console_wallet
Expand Down
30 changes: 16 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ on:
- development
- main
- ci-*
- validator-node
pull_request:
types: [opened, synchronize, reopened]
types: [opened, reopened]

name: CI

Expand All @@ -15,8 +16,8 @@ env:
toolchain: nightly-2021-09-18

jobs:
clippy:
name: clippy
fmt:
name: fmt
runs-on: ubuntu-18.04
steps:
- name: ubuntu dependencies
Expand Down Expand Up @@ -64,6 +65,14 @@ jobs:
name: test
runs-on: ubuntu-18.04
steps:
- 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
- name: checkout
uses: actions/checkout@v2
- name: Caching
Expand All @@ -78,17 +87,10 @@ jobs:
run: |
sudo apt-get update && \
sudo apt-get -y install \
libssl-dev \
openssl \
libsqlite3-dev \
pkg-config \
git \
cmake \
zip \
libc++-dev \
libc++abi-dev \
libprotobuf-dev \
protobuf-compiler
build-essential \
libgtk-3-dev \
libwebkit2gtk-4.0-dev \
libsoup2.4-dev
- name: toolchain
uses: actions-rs/toolchain@v1
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ node_modules

# ignore output files from windows ISS
buildtools/Output/
/applications/tari_collectibles/src-tauri/data
Loading

0 comments on commit 3abefcd

Please sign in to comment.