Skip to content

Commit

Permalink
chore: merging dev into feat-libp2p (#6707)
Browse files Browse the repository at this point in the history
Description
---
Merge `development` into `feat-libp2p`

Motivation and Context
---
`feat-libp2p` needs to be updated

How Has This Been Tested?
---
System-level testing

What process can a PR reviewer use to test or verify this change?
---
Code review

<!-- Checklist -->
<!-- 1. Is the title of your PR in the form that would make nice release
notes? The title, excluding the conventional commit
tag, will be included exactly as is in the CHANGELOG, so please think
about it carefully. -->


Breaking Changes
---

- [x] None
- [ ] Requires data directory on base node to be deleted
- [ ] Requires hard fork
- [ ] Other - Please specify

<!-- Does this include a breaking change? If so, include this line as a
footer -->
<!-- BREAKING CHANGE: Description what the user should do, e.g. delete a
database, resync the chain -->

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: SW van Heerden <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Maciej Kożuszek <[email protected]>
Co-authored-by: C.Lee Taylor <[email protected]>
  • Loading branch information
5 people authored Nov 29, 2024
1 parent b0d71de commit 99b3477
Show file tree
Hide file tree
Showing 78 changed files with 1,577 additions and 218 deletions.
20 changes: 8 additions & 12 deletions .github/workflows/build_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
run: |
BRANCH_NAME=$(echo "${GITHUB_REF}" | sed 's|refs/heads/||')
if [[ "${BRANCH_NAME}" == "build-bins-nextnet"* ]]; then
source buildtools/multinet_envs.sh "v1.8.0-rc.0"
source buildtools/multinet_envs.sh "v1.9.0-rc.0"
else
source buildtools/multinet_envs.sh ${{ env.GHA_NETWORK }}
fi
Expand Down Expand Up @@ -223,14 +223,8 @@ jobs:
- name: Install Windows dependencies
if: startsWith(runner.os,'Windows')
run: |
vcpkg.exe install sqlite3:x64-windows zlib:x64-windows
# Bug in choco - need to install each package individually
choco upgrade llvm -y
# psutils is out of date
# choco upgrade psutils -y
choco upgrade openssl -y
# Should already be installed
# choco upgrade strawberryperl -y
vcpkg install openssl:x64-windows-static
choco upgrade protoc -y
rustup target add ${{ matrix.builds.target }}
Expand Down Expand Up @@ -282,10 +276,8 @@ jobs:
echo "SHELL_EXT=.bat" >> $GITHUB_ENV
echo "TS_DIST=\dist" >> $GITHUB_ENV
echo "PLATFORM_SPECIFIC_DIR=windows" >> $GITHUB_ENV
echo "SQLITE3_LIB_DIR=C:\vcpkg\installed\x64-windows\lib" >> $GITHUB_ENV
echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >> $GITHUB_ENV
echo "LIBCLANG_PATH=C:\Program Files\LLVM\bin" >> $GITHUB_ENV
echo "C:\Strawberry\perl\bin" >> $GITHUB_PATH
echo "VCPKG_ROOT=C:\vcpkg" >> $GITHUB_ENV
echo "OPENSSL_DIR=C:\vcpkg\packages\openssl_x64-windows-static" >> $GITHUB_ENV
- name: Cache cargo files and outputs
if: ${{ ( ! startsWith(github.ref, 'refs/tags/v') ) && ( ! matrix.builds.cross ) && ( env.CARGO_CACHE ) }}
Expand Down Expand Up @@ -325,6 +317,10 @@ jobs:
echo "cargo options is: ${{ env.CARGO_OPTIONS }}"
echo "cross flag: ${{ matrix.builds.cross }}"
- name: Debug environment variables - Windows
if: startsWith(runner.os,'Windows')
run: printenv

- name: Build release binaries
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_test_results_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
files: "artifacts/**/*.xml"

- name: Publish Test Report 2
uses: mikepenz/action-junit-report@v4
uses: mikepenz/action-junit-report@v5
if: always()
with:
report_paths: "artifacts/**/*.xml"
Expand Down
2 changes: 2 additions & 0 deletions .license.ignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
./applications/minotari_node/assets/tari_logo.rs
./applications/minotari_node/osx-pkg/entitlements.xml
./base_layer/contacts/src/schema.rs
./base_layer/core/src/base_node/tari_pulse_service/20326.rsa
./base_layer/core/src/base_node/tari_pulse_service/38696.rsa
./base_layer/key_manager/src/schema.rs
./base_layer/wallet/src/schema.rs
./docs/src/theme/book.js
Expand Down
Loading

0 comments on commit 99b3477

Please sign in to comment.