Skip to content

Commit

Permalink
Merge branch 'development' into libp2p
Browse files Browse the repository at this point in the history
* development:
  chore(ci): remove ledger nanos and update ledger key gif resources (tari-project#6617)
  feat: improve mempool error msg when mempool out of sync (tari-project#6618)
  feat: exit logic for pre-mine spend (tari-project#6615)
  chore: new release esme v1.6.0-pre.0 (tari-project#6614)
  feat: enable identity grpc method by default (tari-project#6613)
  feat: pre-mine introduce temp ban and add counters (tari-project#6612)
  chore: changes mainnet default network (tari-project#6610)
  chore(ci): add riscv64 builds and misc script fixes (tari-project#6611)
  feat!: esme test pre-mine with immediate spend (tari-project#6609)
  feat!: add context to ffi callbacks (tari-project#6608)
  feat: add default exclude dial (tari-project#6607)
  feat!: add input mr into genesis block (tari-project#6601)
  feat: update pre_mine specification (tari-project#6606)
  • Loading branch information
sdbondi committed Oct 10, 2024
2 parents 1165c3a + 96941a4 commit 20ec341
Show file tree
Hide file tree
Showing 85 changed files with 3,450 additions and 1,096 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/build_binaries.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"rust": "stable",
"target": "aarch64-unknown-linux-gnu",
"cross": true,
"flags": "--workspace --exclude minotari_mining_helper_ffi --exclude tari_integration_tests",
"flags": "--features libtor --workspace --exclude minotari_mining_helper_ffi --exclude tari_integration_tests",
"build_metric": true
},
{
Expand All @@ -22,13 +22,15 @@
"rust": "stable",
"target": "riscv64gc-unknown-linux-gnu",
"cross": true,
"flags": "--workspace --exclude minotari_mining_helper_ffi --exclude tari_integration_tests",
"features": "safe",
"flags": "--features libtor --workspace --exclude minotari_mining_helper_ffi --exclude tari_integration_tests",
"build_metric": true,
"build_enabled": true,
"best_effort": true
},
{
"name": "macos-x86_64",
"runs-on": "macos-12",
"runs-on": "macos-13",
"rust": "stable",
"target": "x86_64-apple-darwin",
"cross": false
Expand Down Expand Up @@ -58,6 +60,7 @@
"features": "safe",
"target_bins": "minotari_node, minotari_console_wallet, minotari_merge_mining_proxy, minotari_miner",
"flags": "--workspace --exclude tari_libtor",
"build_enabled": false
"build_enabled": true,
"best_effort": true
}
]
1 change: 1 addition & 0 deletions .github/workflows/build_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ jobs:
# Should already be installed
# choco upgrade strawberryperl -y
choco upgrade protoc -y
rustup target add ${{ matrix.builds.target }}
- name: Set environment variables - Nix
if: ${{ ! startsWith(runner.os,'Windows') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build_ledger_wallet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
fail-fast: false
matrix:
include:
- ledger_target: nanos
best_effort: true
# - ledger_target: nanos
# best_effort: true
- ledger_target: nanox
best_effort: true
- ledger_target: nanosplus
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
echo "Copying files for ${{ env.BINFILE }} to $(pwd)"
ls -la ${{ github.workspace }}/applications/minotari_ledger_wallet/wallet/target/${{ matrix.ledger_target }}/release/
cp -vf ${GITHUB_WORKSPACE}/applications/minotari_ledger_wallet/wallet/target/${{ matrix.ledger_target }}/release/*.json .
cp -vf ${GITHUB_WORKSPACE}/applications/minotari_ledger_wallet/wallet/target/${{ matrix.ledger_target }}/release/key_14x14.gif .
cp -vf ${GITHUB_WORKSPACE}/applications/minotari_ledger_wallet/wallet/target/${{ matrix.ledger_target }}/release/key*.gif .
cp -vf ${GITHUB_WORKSPACE}/applications/minotari_ledger_wallet/wallet/target/${{ matrix.ledger_target }}/release/minotari_ledger_wallet.* .
echo "Compute files shasum"
${SHARUN} * >> "${{ env.BINFILE }}.sha256"
Expand Down
Loading

0 comments on commit 20ec341

Please sign in to comment.