Skip to content

Commit 684faad

Browse files
authored
Merge branch 'master' into gd-buffered-root
2 parents 1a84426 + ca9b5a2 commit 684faad

File tree

282 files changed

+9239
-1749
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

282 files changed

+9239
-1749
lines changed

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.git
2+
target

.github/workflows/ci.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,13 +354,12 @@ jobs:
354354
cd wasm
355355
bash build-release
356356
popd
357-
mv wasm/release/kaspa-wasm32-sdk.zip wasm/release/kaspa-wasm32-sdk-${{ env.SHORT_SHA }}.zip
358357
359358
- name: Upload WASM build to GitHub
360359
uses: actions/upload-artifact@v4
361360
with:
362-
name: kaspa-wasm32-sdk-${{ env.SHORT_SHA }}.zip
363-
path: wasm/release/kaspa-wasm32-sdk-${{ env.SHORT_SHA }}.zip
361+
name: kaspa-wasm32-sdk-${{ env.SHORT_SHA }}
362+
path: wasm/release/
364363
build-release:
365364
name: Build Linux Release
366365
runs-on: ubuntu-latest

.github/workflows/deploy.yaml

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,8 @@ jobs:
6666
cp target/x86_64-unknown-linux-musl/release/rothschild bin/
6767
cp target/x86_64-unknown-linux-musl/release/kaspa-wallet bin/
6868
archive="bin/rusty-kaspa-${{ github.event.release.tag_name }}-linux-amd64.zip"
69-
asset_name="rusty-kaspa-${{ github.event.release.tag_name }}-linux-amd64.zip"
7069
zip -r "${archive}" ./bin/*
7170
echo "archive=${archive}" >> $GITHUB_ENV
72-
echo "asset_name=${asset_name}" >> $GITHUB_ENV
7371
7472
- name: Build on Windows
7573
if: runner.os == 'Windows'
@@ -83,10 +81,8 @@ jobs:
8381
cp target/release/rothschild.exe bin/
8482
cp target/release/kaspa-wallet.exe bin/
8583
archive="bin/rusty-kaspa-${{ github.event.release.tag_name }}-win64.zip"
86-
asset_name="rusty-kaspa-${{ github.event.release.tag_name }}-win64.zip"
8784
powershell "Compress-Archive bin/* \"${archive}\""
8885
echo "archive=${archive}" >> $GITHUB_ENV
89-
echo "asset_name=${asset_name}" >> $GITHUB_ENV
9086
9187
- name: Build on MacOS
9288
if: runner.os == 'macOS'
@@ -99,20 +95,15 @@ jobs:
9995
cp target/release/rothschild bin/
10096
cp target/release/kaspa-wallet bin/
10197
archive="bin/rusty-kaspa-${{ github.event.release.tag_name }}-osx.zip"
102-
asset_name="rusty-kaspa-${{ github.event.release.tag_name }}-osx.zip"
10398
zip -r "${archive}" ./bin/*
10499
echo "archive=${archive}" >> $GITHUB_ENV
105-
echo "asset_name=${asset_name}" >> $GITHUB_ENV
106100
107101
- name: Upload release asset
108-
uses: actions/upload-release-asset@v1
102+
uses: softprops/action-gh-release@v2
103+
with:
104+
files: ./${{ env.archive }}
109105
env:
110106
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
111-
with:
112-
upload_url: ${{ github.event.release.upload_url }}
113-
asset_path: "./${{ env.archive }}"
114-
asset_name: "${{ env.asset_name }}"
115-
asset_content_type: application/zip
116107

117108
build-wasm:
118109
runs-on: ubuntu-latest
@@ -182,19 +173,14 @@ jobs:
182173
run: |
183174
cd wasm
184175
bash build-release
185-
mv release/kaspa-wasm32-sdk.zip ../kaspa-wasm32-sdk-${{ github.event.release.tag_name }}.zip
186-
187-
archive="kaspa-wasm32-sdk-${{ github.event.release.tag_name }}.zip"
188-
asset_name="kaspa-wasm32-sdk-${{ github.event.release.tag_name }}.zip"
176+
cd release
177+
zip -q -r kaspa-wasm32-sdk-${{ github.event.release.tag_name }}.zip kaspa-wasm32-sdk
178+
archive="wasm/release/kaspa-wasm32-sdk-${{ github.event.release.tag_name }}.zip"
189179
echo "archive=${archive}" >> $GITHUB_ENV
190-
echo "asset_name=${asset_name}" >> $GITHUB_ENV
191180
192-
- name: Upload WASM32 SDK
193-
uses: actions/upload-release-asset@v1
181+
- name: Upload release asset
182+
uses: softprops/action-gh-release@v2
183+
with:
184+
files: ./${{ env.archive }}
194185
env:
195186
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
196-
with:
197-
upload_url: ${{ github.event.release.upload_url }}
198-
asset_path: "./${{ env.archive }}"
199-
asset_name: "${{ env.asset_name }}"
200-
asset_content_type: application/zip

0 commit comments

Comments
 (0)