Skip to content

Commit f9244e1

Browse files
Reckless-SatoshiReckless-Satoshi
committed
Fix desktop artifact upload
1 parent e199bba commit f9244e1

File tree

3 files changed

+28
-85
lines changed

3 files changed

+28
-85
lines changed

‎.github/workflows/desktop-build.yml

+9-69
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ jobs:
3838
cd desktopApp
3939
npm install
4040
41-
- name: Install zip utility
42-
run: |
43-
sudo apt-get update
44-
sudo apt-get install -y zip
45-
4641
- name: Build for macOS
4742
run: |
4843
cd desktopApp
@@ -58,88 +53,33 @@ jobs:
5853
cd desktopApp
5954
npm run package-linux
6055
61-
- name: Create ZIP for macOS Build
62-
run: |
63-
cd desktopApp/release-builds/
64-
sudo zip -r /desktopApp-mac.zip ./Robosats-darwin-x64/*
65-
66-
- name: Create ZIP for Windows Build
67-
run: |
68-
cd desktopApp/release-builds/
69-
sudo zip -r /desktopApp-win.zip ./Robosats-win32-ia32/*
70-
71-
- name: Create ZIP for Linux Build
72-
run: |
73-
cd desktopApp/release-builds/
74-
sudo zip -r /desktopApp-linux.zip ./Robosats-linux-x64/*
75-
7656
- name: 'Get Commit Hash'
7757
id: commit
7858
uses: pr-mpt/actions-commit-hash@v3
7959

80-
- name: 'Upload mac-build Release Artifact (for Release)'
81-
uses: actions/upload-artifact@v4
82-
if: inputs.semver != '' # only if this workflow is called from a push to tag (a Release)
83-
with:
84-
name: robosats-desktop-${{ inputs.semver }}-mac.zip
85-
path: desktopApp/release-builds/desktopApp-mac.zip
86-
87-
- name: 'Upload linux-build Release Artifact (for Release)'
88-
uses: actions/upload-artifact@v4
89-
if: inputs.semver != '' # only if this workflow is called from a push to tag (a Release)
90-
with:
91-
name: robosats-desktop-${{ inputs.semver }}-linux.zip
92-
path: desktopApp/release-builds/desktopApp-linux.zip
93-
94-
- name: 'Upload win-build Release Artifact (for Release)'
95-
uses: actions/upload-artifact@v4
96-
if: inputs.semver != '' # only if this workflow is called from a push to tag (a Release)
97-
with:
98-
name: robosats-desktop-${{ inputs.semver }}-win.zip
99-
path: desktopApp/release-builds/desktopApp-win.zip
100-
101-
102-
- name: Create Pre-release
103-
id: create_release
104-
if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release)
105-
uses: ncipollo/[email protected]
106-
with:
107-
tag: desktop-${{ steps.commit.outputs.short }}
108-
name: robosats-desktop-${{ steps.commit.outputs.short }}
109-
prerelease: true
110-
11160
- name: Upload macOS Build Artifact
11261
id: upload-release-mac-zip-asset
113-
if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release)
114-
uses: actions/upload-release-asset@v1
62+
uses: actions/upload-artifact@v4
11563
env:
11664
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
11765
with:
118-
upload_url: ${{ steps.create_release.outputs.upload_url }}
119-
asset_path: /desktopApp-mac.zip
120-
asset_name: robosats-desktop-${{ steps.commit.outputs.short }}-mac.zip
121-
asset_content_type: application/zip
66+
path: desktopApp/release-builds/Robosats-darwin-x64
67+
name: robosats-desktop-${{ steps.commit.outputs.short }}-mac-darwin-x64.zip
12268

12369
- name: Upload Windows Build Artifact
12470
id: upload-release-win-zip-asset
125-
if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release)
126-
uses: actions/upload-release-asset@v1
71+
uses: actions/upload-artifact@v4
12772
env:
12873
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12974
with:
130-
upload_url: ${{ steps.create_release.outputs.upload_url }}
131-
asset_path: /desktopApp-win.zip
132-
asset_name: robosats-desktop-${{ steps.commit.outputs.short }}-win.zip
133-
asset_content_type: application/zip
75+
path: desktopApp/release-builds/Robosats-win32-ia32
76+
name: robosats-desktop-${{ steps.commit.outputs.short }}-win32-ia32.zip
13477

13578
- name: Upload Linux Build Artifact
13679
id: upload-release-linux-zip-asset
137-
if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release)
138-
uses: actions/upload-release-asset@v1
80+
uses: actions/upload-artifact@v4
13981
env:
14082
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
14183
with:
142-
upload_url: ${{ steps.create_release.outputs.upload_url }}
143-
asset_path: /desktopApp-linux.zip
144-
asset_name: robosats-desktop-${{ steps.commit.outputs.short }}-linux.zip
145-
asset_content_type: application/zip
84+
path: desktopApp/release-builds/Robosats-linux-x64
85+
name: robosats-desktop-${{ steps.commit.outputs.short }}-linux-x64.zip

‎.github/workflows/release.yml

+12-9
Original file line numberDiff line numberDiff line change
@@ -183,47 +183,50 @@ jobs:
183183
- name: 'Download macOS Build Artifact'
184184
uses: actions/download-artifact@v4
185185
with:
186-
name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-mac.zip
186+
name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-mac-darwin-x64.zip
187187
path: .
188+
188189
- name: 'Upload macOS Build Artifact'
189190
id: upload-release-mac-zip-asset
190191
uses: actions/upload-release-asset@v1
191192
env:
192193
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
193194
with:
194195
upload_url: ${{ steps.create-release.outputs.upload_url }}
195-
asset_path: desktopApp-mac.zip
196-
asset_name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-mac.zip
196+
asset_path: .
197+
asset_name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-mac-darwin-x64.zip
197198
asset_content_type: application/zip
198199

199200
- name: 'Download linux Build Artifact'
200201
uses: actions/download-artifact@v4
201202
with:
202-
name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-linux.zip
203+
name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-linux-x64.zip
203204
path: .
205+
204206
- name: 'Upload linux Build Artifact'
205207
id: upload-release-linux-zip-asset
206208
uses: actions/upload-release-asset@v1
207209
env:
208210
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
209211
with:
210212
upload_url: ${{ steps.create-release.outputs.upload_url }}
211-
asset_path: desktopApp-linux.zip
212-
asset_name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-linux.zip
213+
asset_path: robosats-desktop-${{ needs.check-versions.outputs.semver }}-linux-x64.zip
214+
asset_name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-linux-x64.zip
213215
asset_content_type: application/zip
214216

215217
- name: 'Download window Build Artifact'
216218
uses: actions/download-artifact@v4
217219
with:
218-
name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-win.zip
220+
name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-win32-ia32.zip
219221
path: .
222+
220223
- name: 'Upload macOS Build Artifact'
221224
id: upload-release-win-zip-asset
222225
uses: actions/upload-release-asset@v1
223226
env:
224227
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
225228
with:
226229
upload_url: ${{ steps.create-release.outputs.upload_url }}
227-
asset_path: desktopApp-win.zip
228-
asset_name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-win.zip
230+
asset_path: robosats-desktop-${{ needs.check-versions.outputs.semver }}-win32-ia32.zip
231+
asset_name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-win32-ia32.zip
229232
asset_content_type: application/zip

‎release_notes.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,33 @@ RoboSats v0.7.0 is now out! :rocket:
1111

1212
# Android
1313

14-
**[Click to download universal RoboSats APK for Android](https://github.com/RoboSats/robosats/releases/download/vv0.7.0-alpha/robosats-vv0.7.0.alpha-universal.apk)**
14+
**[Click to download universal RoboSats APK for Android](https://github.com/RoboSats/robosats/releases/download/v0.7.0-alpha/robosats-v0.7.0.alpha-universal.apk)**
1515
Smaller bundles for each CPU architecture available in the attachments.
1616

1717
### Verify the app using GPG:
1818

19-
1. [Download the ascii armored signature](https://github.com/Reckless-Satoshi/robosats/releases/download/vv0.7.0-alpha/robosats-vv0.7.0.alpha-universal.apk.asc)
19+
1. [Download the ascii armored signature](https://github.com/Reckless-Satoshi/robosats/releases/download/v0.7.0-alpha/robosats-v0.7.0.alpha-universal.apk.asc)
2020

2121
2. Run this command on a directory that contains the apk file and and the ascii armored signature.
22-
`gpg --verify robosats-vv0.7.0.alpha-universal.apk.asc`
22+
`gpg --verify robosats-v0.7.0.alpha-universal.apk.asc`
2323

2424
3. Verify the signer is actually Reckless-Satoshi (fingerprints match): [B4AB5F19113D4125DDF217739C4585B561315571](https://keys.openpgp.org/vks/v1/by-fingerprint/B4AB5F19113D4125DDF217739C4585B561315571)
2525

2626
Alternatively you can also verify with the release with the SHA256 checksum.
2727

2828
# Docker Images
2929

30-
[Coordinator Backend Image vv0.7.0-alpha (Docker Hub)](https://hub.docker.com/r/recksato/robosats/tags?page=1&name=vv0.7.0-alpha)
30+
[Coordinator Backend Image v0.7.0-alpha (Docker Hub)](https://hub.docker.com/r/recksato/robosats/tags?page=1&name=v0.7.0-alpha)
3131

3232

3333
```bash
34-
docker pull recksato/robosats:vv0.7.0-alpha
34+
docker pull recksato/robosats:v0.7.0-alpha
3535
```
3636

37-
[Client App Image vv0.7.0-alpha (Docker Hub)](https://hub.docker.com/r/recksato/robosats-client/tags?page=1&name=vv0.7.0-alpha)
37+
[Client App Image v0.7.0-alpha (Docker Hub)](https://hub.docker.com/r/recksato/robosats-client/tags?page=1&name=v0.7.0-alpha)
3838

3939
```bash
40-
docker pull recksato/robosats-client:vv0.7.0-alpha
40+
docker pull recksato/robosats-client:v0.7.0-alpha
4141
```
4242

4343
See [nodeapp/docker-compose.yml](https://github.com/Reckless-Satoshi/robosats/blob/2cd9d748706a8dcc0f03006b483acc6000e0572a/nodeapp/docker-compose.yml) for an example docker-compose usage of the `robosats-client` image.

0 commit comments

Comments
 (0)