Skip to content

Commit

Permalink
Deploy linux binary without musl in its name + various minor miscella…
Browse files Browse the repository at this point in the history
…neous things towards v0.15.2 (#564)

* remove musl from linux binary name

* remove simpa from win and osx builds in order to be consistent with linux build

* safe eqv optimization: use inplace truncate (tested)
  • Loading branch information
michaelsutton committed Sep 20, 2024
1 parent 4d03153 commit 9fae376
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ jobs:
cp target/x86_64-unknown-linux-musl/release/kaspad bin/
cp target/x86_64-unknown-linux-musl/release/rothschild bin/
cp target/x86_64-unknown-linux-musl/release/kaspa-wallet bin/
archive="bin/rusty-kaspa-${{ github.event.release.tag_name }}-linux-musl-amd64.zip"
asset_name="rusty-kaspa-${{ github.event.release.tag_name }}-linux-musl-amd64.zip"
archive="bin/rusty-kaspa-${{ github.event.release.tag_name }}-linux-amd64.zip"
asset_name="rusty-kaspa-${{ github.event.release.tag_name }}-linux-amd64.zip"
zip -r "${archive}" ./bin/*
echo "archive=${archive}" >> $GITHUB_ENV
echo "asset_name=${asset_name}" >> $GITHUB_ENV
Expand All @@ -76,12 +76,10 @@ jobs:
shell: bash
run: |
cargo build --bin kaspad --release
cargo build --bin simpa --release
cargo build --bin rothschild --release
cargo build --bin kaspa-wallet --release
mkdir bin || true
cp target/release/kaspad.exe bin/
cp target/release/simpa.exe bin/
cp target/release/rothschild.exe bin/
cp target/release/kaspa-wallet.exe bin/
archive="bin/rusty-kaspa-${{ github.event.release.tag_name }}-win64.zip"
Expand All @@ -94,12 +92,10 @@ jobs:
if: runner.os == 'macOS'
run: |
cargo build --bin kaspad --release
cargo build --bin simpa --release
cargo build --bin rothschild --release
cargo build --bin kaspa-wallet --release
mkdir bin || true
cp target/release/kaspad bin/
cp target/release/simpa bin/
cp target/release/rothschild bin/
cp target/release/kaspa-wallet bin/
archive="bin/rusty-kaspa-${{ github.event.release.tag_name }}-osx.zip"
Expand Down
2 changes: 1 addition & 1 deletion rpc/service/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ NOTE: This error usually indicates an RPC conversion error between the node and
.get_virtual_chain_accepted_transaction_ids(&session, &virtual_chain_batch, Some(batch_size))
.await?;
// bound added to the length of the accepted transaction ids, which is bounded by merged blocks
virtual_chain_batch.added = virtual_chain_batch.added[..accepted_transaction_ids.len()].to_vec();
virtual_chain_batch.added.truncate(accepted_transaction_ids.len());
accepted_transaction_ids
} else {
vec![]
Expand Down

0 comments on commit 9fae376

Please sign in to comment.