Skip to content

Commit

Permalink
Merge branch 'development' into pr/3820
Browse files Browse the repository at this point in the history
* development:
  chore: clean up providing seed words from LibWallet (tari-project#3906)
  chore: move tari_script into its own crate (tari-project#3909)
  fix(consensus): check blockchain version within valid range (tari-project#3916)
  ci: fix missing npm deps and add javascript ci (tari-project#3910)
  refactor: use clap as a commands parser (tari-project#3867)
  chore: use git tagged tari_utilities and tari-crypto deps (tari-project#3913)
  fix: aligned tables left (tari-project#3899)
  ci: fix vue build
  v0.29.0
  feat!: add recovery byte to output features (tari-project#3727)
  add ffi ci check (tari-project#3915)
  • Loading branch information
sdbondi committed Mar 16, 2022
2 parents faa54b9 + 6a3ccb5 commit 5804caa
Show file tree
Hide file tree
Showing 199 changed files with 13,186 additions and 28,968 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/base_node_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,13 @@ jobs:
- name: Compile launchpad GUI
run: |
cd applications/launchpad/gui-vue
npm install
npm ci
npm run build
- name: Compile collectibles GUI
run: |
cd applications/tari_collectibles/web-app
npm install
npm ci
npm run build
- name: Info - Pre-Compile Space Check for Nix
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@ jobs:
with:
command: check
args: --release --all-targets
- name: cargo check ffi separately
uses: actions-rs/cargo@v1
with:
command: check
args: --release --package tari_wallet_ffi

build-stable:
name: check stable
runs-on: ubuntu-18.04
Expand Down Expand Up @@ -128,6 +134,33 @@ jobs:
with:
command: check
args: --release --all-targets
- name: cargo check ffi separately
uses: actions-rs/cargo@v1
with:
command: check
args: --release --package tari_wallet_ffi
javascript:
name: npm packages
runs-on: ubuntu-18.04
steps:
- name: checkout
uses: actions/checkout@v2
- name: build launchpad gui-vue
run: |
cd applications/launchpad/gui-vue
npm ci
npm run build
- name: build collectibles web-app
run: |
cd applications/tari_collectibles/web-app
npm ci
npm run build
- name: lint/fmt tari explorer
run: |
cd applications/tari_explorer
npm ci
npm run lint
npm run check-fmt
test:
name: test
runs-on: ubuntu-18.04
Expand Down
Loading

0 comments on commit 5804caa

Please sign in to comment.