Skip to content

Commit

Permalink
Merge pull request #209 from blocknetdx/dev
Browse files Browse the repository at this point in the history
Merge dev to main
  • Loading branch information
tryiou authored Dec 7, 2023
2 parents 142276a + d9aec51 commit af853b4
Show file tree
Hide file tree
Showing 24 changed files with 208 additions and 2,173 deletions.
13 changes: 12 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
dist-native/*.tar.gz
dist-native/*.AppImage
dist-native/*.deb
dist-native/latest*.yml
- uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/v')
Expand All @@ -51,6 +52,7 @@ jobs:
dist-native/*.tar.gz
dist-native/*.AppImage
dist-native/*.deb
dist-native/latest*.yml
build_mac:
runs-on: macos-13
Expand All @@ -62,6 +64,11 @@ jobs:
with:
node-version: 18

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.10'

- run: npm install --no-audit
- run: |
npm run download-binaries-mac
Expand All @@ -75,6 +82,7 @@ jobs:
dist-native/*.dmg
dist-native/*.dmg.blockmap
dist-native/*.zip
dist-native/latest*.yml
- uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/v')
Expand All @@ -86,6 +94,7 @@ jobs:
dist-native/*.dmg
dist-native/*.dmg.blockmap
dist-native/*.zip
dist-native/latest*.yml
build_win:
runs-on: windows-2022
Expand All @@ -100,14 +109,15 @@ jobs:
- run: npm install --no-audit
- run: npm run download-binaries-win
- run: npm run build-native-win

- uses: actions/upload-artifact@v3
with:
name: artifacts-win
path: |
dist-native/*.exe
dist-native/*.exe.blockmap
dist-native/*.zip
dist-native/latest*.yml
- uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/v')
Expand All @@ -119,3 +129,4 @@ jobs:
dist-native/*.exe
dist-native/*.exe.blockmap
dist-native/*.zip
dist-native/latest*.yml
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,4 @@ package-lock.json
/temp
.DS_Store
/bin
.history/
12 changes: 6 additions & 6 deletions bin.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"linux": {
"url": "https://github.com/blocknetdx/xlite-daemon/releases/download/v0.5.13/xlite-daemon-linux64",
"hash": "3b74ccd13fa167e14248322d31e80553370fe297c58309b4192da63787bf0934"
"url": "https://github.com/blocknetdx/xlite-daemon/releases/download/v0.5.14/xlite-daemon-linux64",
"hash": "a37563bf49dbf643378e0231bde5121d4e46d1142738ae7829a0221db814e788"
},
"mac": {
"url": "https://github.com/blocknetdx/xlite-daemon/releases/download/v0.5.13/xlite-daemon-osx64",
"hash": "b24b6b7bc1c3bb868a18456bc783b5dec9a24ef7a60fbed2c64c99331ee1e323"
"url": "https://github.com/blocknetdx/xlite-daemon/releases/download/v0.5.14/xlite-daemon-osx64",
"hash": "227a487d5fee74a6495743437dac496ce01a7f2a9f1c79d8a0650e927ea9b063"
},
"win": {
"url": "https://github.com/blocknetdx/xlite-daemon/releases/download/v0.5.13/xlite-daemon-win64.exe",
"hash": "5b4a0713dfcbd903cefe400b5e38898b9c14f4c69a7a270bbb654de3a85c4189"
"url": "https://github.com/blocknetdx/xlite-daemon/releases/download/v0.5.14/xlite-daemon-win64.exe",
"hash": "18a1d00d1c0885f1506a826462f840dc043f89eb6d64523f0c370f1900e774e0"
}
}
Loading

0 comments on commit af853b4

Please sign in to comment.