Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merging dev into feat-libp2p #6707

Merged
merged 20 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e61b5e2
feat: verify active base node peer connections and disconnect if stal…
hansieodendaal Nov 1, 2024
06f7a68
feat: update ledger instructions (#6673)
hansieodendaal Nov 7, 2024
a2aa20e
chore(deps): bump mikepenz/action-junit-report from 4 to 5 (#6672)
dependabot[bot] Nov 7, 2024
69a5872
feat!: add new header field (#6686)
SWvheerden Nov 14, 2024
10f4077
chore: new release for esme v1.9.0-pre.0 (#6688)
SWvheerden Nov 14, 2024
d58c670
chore: add helper functions for generating output proofs (#6694)
SWvheerden Nov 19, 2024
0610bcc
feat: validate blockchain fetch from DNS server with local state (#6658)
MCozhusheck Nov 19, 2024
d22ef65
feat: fix base node shutdown (#6697)
hansieodendaal Nov 22, 2024
321e9ba
fix(tari-pulse): await shutdown signal in main loop (#6696)
MCozhusheck Nov 26, 2024
e22bc0e
feat: add connectivity timeout (#6703)
hansieodendaal Nov 27, 2024
dc57806
chore(ci): add docs for Windows build setup, update randomx-rs and fi…
leet4tari Nov 27, 2024
eaa0306
feat: make hickory dns optional (#6705)
SWvheerden Nov 27, 2024
a75e0c6
feat: fix tari pulse running as fast as possible (#6704)
hansieodendaal Nov 27, 2024
1104d20
Merging dev #6655
hansieodendaal Nov 27, 2024
c21e656
Merge development
hansieodendaal Nov 28, 2024
8e3a9ae
Merge development
hansieodendaal Nov 28, 2024
3beaa5f
Merge development
hansieodendaal Nov 28, 2024
68b8e26
Merge branch 'development' into ho_merge_dev
hansieodendaal Nov 28, 2024
a225333
merge conflicts
hansieodendaal Nov 28, 2024
f883507
openssl -> vendored feature
hansieodendaal Nov 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading