Skip to content

Commit

Permalink
Merge branch 'development' into core-covenants-initial-impl
Browse files Browse the repository at this point in the history
* development:
  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
  v0.22.1.1
  v0.22.1
  ci: add build step (tari-project#3678)
  fix: edge cases causing bans during header/block sync (tari-project#3661)
  fix: end stale outbound queue immediately on disconnect, retry outbound messages (tari-project#3664)
  feat: add search by commitment to explorer (tari-project#3668)
  feat: tari launchpad (tari-project#3671)
  feat: base_node switching for console_wallet when status is offline (tari-project#3639)
  feat: improve wallet recovery and scanning handling of reorgs (tari-project#3655)
  feat: add GRPC call to search for utxo via commitment hex (tari-project#3666)
  feat: custom_base_node in config (tari-project#3651)
  fix: return correct index for include_pruned_utxos = false (tari-project#3663)
  • Loading branch information
sdbondi committed Jan 10, 2022
2 parents 41438f7 + 10011d1 commit 94c2bfc
Show file tree
Hide file tree
Showing 328 changed files with 42,572 additions and 2,199 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/base_node_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,12 @@ jobs:
target
key: ${{ runner.os }}-${{ matrix.os }}-${{ matrix.target_cpu }}-${{ matrix.features }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}

- name: Compile NPM
run: |
cd applications/launchpad/gui-vue
npm install
npm run build
- name: Compile react (collectibles)
run: |
cd applications/tari_collectibles/web-app
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 94c2bfc

Please sign in to comment.