Merge branch 'master' into eviction_logic

kaspanet · Sep 26, 2024 · 541bfc4 · 541bfc4
2 parents f84cb4e + 4bfa392
commit 541bfc4
Show file tree

Hide file tree

Showing 18 changed files with 353 additions and 165 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -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
@@ -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"
@@ -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"