Skip to content

Commit

Permalink
Merge branch 'development' into comms-fix-liveness-check-for-multiple…
Browse files Browse the repository at this point in the history
…-addresses

* development:
  chore: fix windows install (tari-project#5616)
  feat: ban peer unexpected response (tari-project#5608)
  fix!: add validator mr to mining hash (tari-project#5615)
  fix: check bytes remaining on monero blocks (tari-project#5610)
  fix: duplicate tari header in monero coinbase (tari-project#5604)
  fix: monero fork attack (tari-project#5603)
  feat: add mempool min fee (tari-project#5606)
  chore(tests): large block unit tests (tari-project#5599)
  fix: miner delay attack (tari-project#5582)
  fix: peer connection to stale nodes (tari-project#5579)
  ci(fix): artifact cleanup for diag-utils (tari-project#5613)
  ci(fix): update Windows installer for Minotari (tari-project#5614)
  chore: fixes monero build (tari-project#5612)
  • Loading branch information
sdbondi committed Aug 10, 2023
2 parents 54e0363 + 613e348 commit 8150dd1
Show file tree
Hide file tree
Showing 59 changed files with 1,169 additions and 495 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/base_node_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ jobs:
uses: actions/upload-artifact@v3
if: startsWith(runner.os,'Windows')
with:
name: "tari_windows_installer"
name: "${{ env.TBN_FILENAME }}_windows_installer"
path: "${{ github.workspace }}/buildtools/Output/*"

- name: Archive and Checksum Binaries
Expand Down Expand Up @@ -439,6 +439,12 @@ jobs:
name: ${{ env.TBN_FILENAME }}_archive-diag-utils-${{ matrix.builds.name }}
path: "${{ github.workspace }}${{ env.TBN_DIST }}/diag-utils/*.zip*"

- name: Artifact cleanup for diag-utils
continue-on-error: true
shell: bash
run: |
rm -vRf "${{ github.workspace }}${{ env.TBN_DIST }}/diag-utils/"
- name: Sync dist to S3 - Bash
continue-on-error: true # Don't break if s3 upload fails
if: ${{ env.AWS_SECRET_ACCESS_KEY != '' && matrix.builds.runs-on != 'self-hosted' }}
Expand Down
15 changes: 0 additions & 15 deletions .license.ignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
./CODEOWNERS
./LICENSE
./Makefile
./applications/minotari_node/assets/tari_banner.rs
./applications/minotari_node/assets/tari_logo.rs
./applications/minotari_node/linux/setup_tor_service
./applications/minotari_node/linux/start_all
./applications/minotari_node/linux/start_tari_base_node
./applications/minotari_node/linux/start_tor
./applications/minotari_node/osx-pkg/env-sample
./applications/minotari_node/osx-pkg/scripts/postinstall
./applications/minotari_node/osx-pkg/scripts/preinstall
./applications/minotari_console_wallet/linux/start_tari_console_wallet
./base_layer/contacts/src/schema.rs
./base_layer/key_manager/Makefile
./base_layer/key_manager/src/schema.rs
./base_layer/p2p/src/dns/roots/tls.rs
./base_layer/wallet/src/schema.rs
./buildtools/docker/torrc
./buildtools/vagrant/Vagrantfile
./docs/src/theme/book.js
./docs/src/theme/highlight.js
./scripts/env_sample
Loading

0 comments on commit 8150dd1

Please sign in to comment.