Skip to content

Commit 72f524d

Browse files
allancodingallancoding
committed
simplify things
1 parent eff7845 commit 72f524d

4 files changed

Lines changed: 58 additions & 123 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 8 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ jobs:
110110
path: |
111111
dist/*.AppImage
112112
dist/*.zip
113-
dist/emulatorjs-netplay-server
114113
115114
build-docker:
116115
needs: [check-version]
@@ -139,12 +138,6 @@ jobs:
139138
docker tag emulatorjs-netplay-server ghcr.io/emulatorjs/emulatorjs-netplay/emulatorjs-netplay-server:latest
140139
docker push ghcr.io/emulatorjs/emulatorjs-netplay/emulatorjs-netplay-server:latest
141140
142-
- name: Upload Docker artifact
143-
uses: actions/upload-artifact@v2
144-
with:
145-
name: docker-artifact
146-
path: docker-compose.yml
147-
148141
create-release:
149142
needs: [build-windows, build-linux, build-docker, check-version]
150143
if: ${{ needs.check-version.outputs.changed == 'true' }}
@@ -171,117 +164,25 @@ jobs:
171164
name: linux-artifacts
172165
path: dist/
173166

174-
- name: Download docker artifact
175-
uses: actions/download-artifact@v2
176-
with:
177-
name: docker-artifact
178-
path: dist/
179-
180167
- name: Rename Files
181168
run: |
182-
mv "dist/emulatorjs-netplay-server" "dist/EmulatorJS Netplay Server-linux-${{ needs.check-version.outputs.version }}"
183169
mv "dist/emulatorjs-netplay-server-${{ needs.check-version.outputs.version }}.zip" "dist/EmulatorJS Netplay Server-linux-${{ needs.check-version.outputs.version }}.zip"
184170
mv "dist/EmulatorJS Netplay Server-${{ needs.check-version.outputs.version }}.AppImage" "dist/EmulatorJS Netplay Server App-linux-${{ needs.check-version.outputs.version }}.AppImage"
185171
mv "dist/EmulatorJS Netplay Server ${{ needs.check-version.outputs.version }}.exe" "dist/EmulatorJS Netplay Server App-windows-${{ needs.check-version.outputs.version }}.exe"
186172
mv "dist/EmulatorJS Netplay Server-${{ needs.check-version.outputs.version }}-win.zip" "dist/EmulatorJS Netplay Server-windows-${{ needs.check-version.outputs.version }}.zip"
187173
mv "dist/emulatorjs-netplay-server.exe" "dist/EmulatorJS Netplay Server-windows-${{ needs.check-version.outputs.version }}.exe"
188174
189-
- name: Create Release Notes
190-
id: changelog
191-
run: |
192-
npx -y --quiet changelog-maker --markdown --group --commit-url=https://github.com/EmulatorJS/EmulatorJS-Netplay/commit/{ref} >> CHANGELOG.md
193-
echo "::set-output name=releasenotes::$(cat CHANGELOG.md)"
194-
195-
- name: Create Release
175+
- name: Create Release & Make Notes & Upload Assets
196176
id: create_release
197-
uses: actions/create-release@v1
198-
env:
199-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
200-
with:
201-
tag_name: v${{ needs.check-version.outputs.version }}
202-
release_name: v${{ needs.check-version.outputs.version }}
203-
draft: false
204-
prerelease: false
205-
body: |
206-
## Changelog
207-
${{ steps.changelog.outputs.releasenotes }}
208-
209-
- name: Upload Release Asset Docker
210-
id: upload-release-asset-docker
211-
uses: actions/upload-release-asset@v1
212-
env:
213-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
214-
with:
215-
upload_url: ${{ steps.create_release.outputs.upload_url }}
216-
asset_path: dist/docker-compose.yml
217-
asset_name: docker-compose.yml
218-
asset_content_type: application/yml
219-
220-
- name: Upload Release Asset Linux
221-
id: upload-release-asset-linux
222-
uses: actions/upload-release-asset@v1
223177
env:
224178
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
225-
with:
226-
upload_url: ${{ steps.create_release.outputs.upload_url }}
227-
asset_path: dist/EmulatorJS Netplay Server-linux-${{ needs.check-version.outputs.version }}
228-
asset_name: EmulatorJS Netplay Server-linux-${{ needs.check-version.outputs.version }}
229-
asset_content_type: application/octet-stream
230-
231-
- name: Upload Release Asset Linux Zip
232-
id: upload-release-asset-linux-zip
233-
uses: actions/upload-release-asset@v1
234-
env:
235-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
236-
with:
237-
upload_url: ${{ steps.create_release.outputs.upload_url }}
238-
asset_path: dist/EmulatorJS Netplay Server-linux-${{ needs.check-version.outputs.version }}.zip
239-
asset_name: EmulatorJS Netplay Server-linux-${{ needs.check-version.outputs.version }}.zip
240-
asset_content_type: application/zip
241-
242-
- name: Upload Release Asset Linux AppImage
243-
id: upload-release-asset-linux-appimage
244-
uses: actions/upload-release-asset@v1
245-
env:
246-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
247-
with:
248-
upload_url: ${{ steps.create_release.outputs.upload_url }}
249-
asset_path: dist/EmulatorJS Netplay Server App-linux-${{ needs.check-version.outputs.version }}.AppImage
250-
asset_name: EmulatorJS Netplay Server App-linux-${{ needs.check-version.outputs.version }}.AppImage
251-
asset_content_type: application/appimage
252-
253-
- name: Upload Release Asset Windows
254-
id: upload-release-asset-windows
255-
uses: actions/upload-release-asset@v1
256-
env:
257-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
258-
with:
259-
upload_url: ${{ steps.create_release.outputs.upload_url }}
260-
asset_path: dist/EmulatorJS Netplay Server-windows-${{ needs.check-version.outputs.version }}.exe
261-
asset_name: EmulatorJS Netplay Server-windows-${{ needs.check-version.outputs.version }}.exe
262-
asset_content_type: application/exe
263-
264-
- name: Upload Release Asset Windows Zip
265-
id: upload-release-asset-windows-zip
266-
uses: actions/upload-release-asset@v1
267-
env:
268-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
269-
with:
270-
upload_url: ${{ steps.create_release.outputs.upload_url }}
271-
asset_path: dist/EmulatorJS Netplay Server-windows-${{ needs.check-version.outputs.version }}.zip
272-
asset_name: EmulatorJS Netplay Server-windows-${{ needs.check-version.outputs.version }}.zip
273-
asset_content_type: application/zip
274-
275-
- name: Upload Release Asset Windows App
276-
id: upload-release-asset-windows-app
277-
uses: actions/upload-release-asset@v1
278-
env:
279-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
280-
with:
281-
upload_url: ${{ steps.create_release.outputs.upload_url }}
282-
asset_path: dist/EmulatorJS Netplay Server App-windows-${{ needs.check-version.outputs.version }}.exe
283-
asset_name: EmulatorJS Netplay Server App-windows-${{ needs.check-version.outputs.version }}.exe
284-
asset_content_type: application/exe
179+
run: |
180+
gh release create "v${{ needs.check-version.outputs.version }}" --title "v${{ needs.check-version.outputs.version }}" --generate-notes
181+
gh release upload "v${{ needs.check-version.outputs.version }}" dist/EmulatorJS Netplay Server-linux-${{ needs.check-version.outputs.version }}.zip#EmulatorJS Netplay Server-linux-${{ needs.check-version.outputs.version }}.zip
182+
gh release upload "v${{ needs.check-version.outputs.version }}" dist/EmulatorJS Netplay Server App-linux-${{ needs.check-version.outputs.version }}.AppImage#EmulatorJS Netplay Server App-linux-${{ needs.check-version.outputs.version }}.AppImage
183+
gh release upload "v${{ needs.check-version.outputs.version }}" dist/EmulatorJS Netplay Server-windows-${{ needs.check-version.outputs.version }}.zip#EmulatorJS Netplay Server-windows-${{ needs.check-version.outputs.version }}.zip
184+
gh release upload "v${{ needs.check-version.outputs.version }}" dist/EmulatorJS Netplay Server App-windows-${{ needs.check-version.outputs.version }}.exe#EmulatorJS Netplay Server App-windows-${{ needs.check-version.outputs.version }}.exe
185+
gh release upload "v${{ needs.check-version.outputs.version }}" dist/EmulatorJS Netplay Server-windows-${{ needs.check-version.outputs.version }}.exe#EmulatorJS Netplay Server-windows-${{ needs.check-version.outputs.version }}.exe
285186
286187
- name: Purge artifacts
287188
uses: kolpav/purge-artifacts-action@v1

‎CHANGELOG.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
### Changelog
2+
3+
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
4+
5+
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
6+
7+
#### [v0.4.0](https://github.com/EmulatorJS/EmulatorJS-Netplay/compare/v0.3.9...v0.4.0)
8+
9+
> 1 July 2023
10+
11+
- add some code an bump version test [`fdd5d91`](https://github.com/EmulatorJS/EmulatorJS-Netplay/commit/fdd5d919a4222466fa3e6998e6490c1846e4a635)
12+
- fix the release notes [`de31016`](https://github.com/EmulatorJS/EmulatorJS-Netplay/commit/de3101601d8a4c161d3ffc930437708c1be2af1e)
13+
14+
#### [v0.3.9](https://github.com/EmulatorJS/EmulatorJS-Netplay/compare/v0.3.8...v0.3.9)
15+
16+
> 1 July 2023
17+
18+
- get release notes added! [`babf0bb`](https://github.com/EmulatorJS/EmulatorJS-Netplay/commit/babf0bb509c38a4284f3f0e25b8b0e002647fe86)
19+
- test version bump [`2d5ca54`](https://github.com/EmulatorJS/EmulatorJS-Netplay/commit/2d5ca5425cdfb82748714f412364db34315cd0a6)
20+
21+
#### [v0.3.8](https://github.com/EmulatorJS/EmulatorJS-Netplay/compare/v0.3.1...v0.3.8)
22+
23+
> 1 July 2023
24+
25+
- add logic [`e78f6e1`](https://github.com/EmulatorJS/EmulatorJS-Netplay/commit/e78f6e1d7f74eb86e9bbc20c0efd97d0b48432a5)
26+
- optomize everthing [`5ac9f79`](https://github.com/EmulatorJS/EmulatorJS-Netplay/commit/5ac9f79f9459c1278d86441dfea42796c24ffd72)
27+
- get it to work [`f8f35e9`](https://github.com/EmulatorJS/EmulatorJS-Netplay/commit/f8f35e979d96c58ecd8b37b98f5e84b87336b86d)
28+
29+
#### v0.3.1
30+
31+
> 1 July 2023
32+
33+
- Start the netplay code! [`2d5188d`](https://github.com/EmulatorJS/EmulatorJS-Netplay/commit/2d5188d92c889e7f9c36e47fea1b6d4dfda11f13)
34+
- Initial commit [`5d16f17`](https://github.com/EmulatorJS/EmulatorJS-Netplay/commit/5d16f1724c00797eb80dfb02104854536ea0028f)
35+
- work on readme [`c6dd686`](https://github.com/EmulatorJS/EmulatorJS-Netplay/commit/c6dd686b025a7b94541d3a41b8b089c0b58e331e)

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ You can also download the source code and run `npm i` to install packages and th
3636

3737
Go to the releases tab and download the [latest release](https://github.com/EmulatorJS/EmulatorJS-Netplay/releases/tag/latest) for linux and open the AppImage file (you may need to make it executable).
3838

39-
There is a AppImage version and a CLI version.
39+
There is a AppImage version.
4040
* The AppImage version is recommended for most users.
41-
* The CLI version is recommended for advanced users.
41+
* You can also download the source code and run `npm i` to install packages and then `npm start` to start the server.
4242

4343
### Docker:
4444

‎package.json‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
{
22
"name": "emulatorjs-netplay-server",
33
"productName": "EmulatorJS Netplay Server",
4-
"version": "0.4.0",
4+
"version": "0.4.1",
55
"main": "app.js",
6-
"bin": "server.js",
76
"description": "A Netplay Server For EmulatorJS",
87
"author": {
98
"name": "EmulatorJS",
109
"url": "https://github.com/EmulatorJS"
1110
},
12-
"pkg": {
13-
"scripts": "**/*.js",
14-
"assets": "**/*",
15-
"targets": [
16-
"latest-linux-x64",
17-
"latest-win-x64"
18-
],
19-
"outputPath": "dist"
11+
"nexe": {
12+
"input": "index.js",
13+
"output": "dist/emulatorjs-netplay-server.exe",
14+
"ico": "src/img/icon.ico",
15+
"resources": [
16+
"src/**/*",
17+
"*.json",
18+
"*.js"
19+
]
2020
},
2121
"build": {
2222
"appId": "org.emulatorjs.netplay.server",
@@ -41,8 +41,8 @@
4141
"start": "node index.js",
4242
"dev": "node index.js -d",
4343
"app": "electron .",
44-
"build-win": "electron-builder --win --publish=never && pkg ./ --targets latest-win-x64",
45-
"build-linux": "electron-builder --linux --publish=never && pkg ./ --targets latest-linux-x64",
44+
"build-win": "electron-builder --win --publish=never && nexe --build",
45+
"build-linux": "electron-builder --linux --publish=never",
4646
"build-docker": "docker build -t emulatorjs-netplay-server ."
4747
},
4848
"dependencies": {
@@ -51,7 +51,6 @@
5151
},
5252
"devDependencies": {
5353
"electron": "^25.2.0",
54-
"electron-builder": "^24.4.0",
55-
"pkg": "^5.8.1"
54+
"electron-builder": "^24.4.0"
5655
}
5756
}

0 commit comments

Comments
 (0)