Merge branch 'development' into sw_emse_fix

tari-project · Aug 11, 2022 · a201a7f · a201a7f
2 parents 7405126 + 52bc2be
commit a201a7f
Show file tree

Hide file tree

Showing 299 changed files with 15 additions and 25,883 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -31,9 +31,6 @@ commands:
       - run:
           name: Build miner
           command: cargo build --release --bin tari_miner
-      - run:
-          name: Build validator node
-          command: cargo build --release --bin tari_validator_node
       - run:
           name: Run cucumber scenarios
           no_output_timeout: 20m
@@ -64,9 +61,6 @@ 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
@@ -79,9 +73,6 @@ commands:
       - run:
           name: Build miner
           command: cargo build --release --bin tari_miner
-      - run:
-          name: Build validator node
-          command: cargo build --release --bin tari_validator_node
       # Below step requires NodeJS v12 to run correctly, see explanation in WalletFFI.feature
       - run:
           name: Run FFI wallet library cucumber scenarios

diff --git a/.github/workflows/dan_layer_integration_tests.yml b/.github/workflows/dan_layer_integration_tests.yml
diff --git a/.license.ignore b/.license.ignore
@@ -12,6 +12,7 @@
 ./applications/tari_base_node/osx-pkg/scripts/preinstall
 ./applications/tari_console_wallet/linux/start_tari_console_wallet
 ./base_layer/key_manager/Makefile
+./base_layer/p2p/src/dns/roots/tls.rs
 ./buildtools/docker/torrc
 ./docs/src/theme/book.js
 ./docs/src/theme/highlight.js