Skip to content

Commit ae8198d

Browse files
committed
Doc update: KB shortcuts
1 parent 9e60796 commit ae8198d

File tree

6 files changed

+105
-10
lines changed

6 files changed

+105
-10
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# .github/workflows/ci.yml
12
name: Build & Release
23

34
on:
@@ -7,7 +8,6 @@ on:
78

89
permissions:
910
contents: write
10-
packages: write
1111

1212
env:
1313
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -27,7 +27,24 @@ jobs:
2727
- name: Install Linux dependencies
2828
run: |
2929
sudo apt-get update
30-
sudo apt-get install -y dpkg fakeroot jq npm bash fuse cmake libsdl2-dev
30+
sudo apt-get install -y dpkg fakeroot fuse cmake libsdl2-dev jq
31+
npm install
32+
curl -L -o appimagetool-x86_64.AppImage https://github.com/AppImage/AppImageKit/releases/latest/download/appimagetool-x86_64.AppImage
33+
chmod +x appimagetool-x86_64.AppImage
34+
chmod +x build.sh
35+
source build.sh
3136
32-
- name: Build and post-process Linux packages
33-
run: npm run build
37+
- name: Build
38+
run: npx electron-builder --config builder.yml --linux --publish=never
39+
40+
- name: Create Release
41+
uses: softprops/action-gh-release@v1
42+
with:
43+
name: Emulsion ${{ github.ref_name }}
44+
draft: false
45+
prerelease: false
46+
files: |
47+
dist/*.deb
48+
dist/*.AppImage
49+
dist/*.rpm
50+
generate_release_notes: true

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,10 @@ Want more options and higher-quality covers? Add free API keys to expand Emulsio
129129

130130
All images and metadata are saved alongside your platform games / ROMs, keeping your collection organized.
131131

132+
## Global settings
133+
134+
![Global settings](https://yphil.gitlab.io/images/emulsion-settings.png?cache=x)
135+
132136
## Controls
133137

134138
### Home

build.sh

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
#!/usr/bin/env bash
2+
3+
# See .gitlab-ci.yml for build system dependancies
4+
5+
# mkdir -pv dist
6+
7+
packageName() {
8+
echo "$(jq -r '.name' package.json)"
9+
}
10+
11+
author() {
12+
echo "$(jq -r '.author.name' package.json) <$(jq -r '.author.email' package.json)>"
13+
}
14+
15+
PACKAGE_NAME=$(packageName)
16+
PACKAGE_VERSION=$(jq -r '.version' package.json)
17+
18+
echo "Building $PACKAGE_NAME v$PACKAGE_VERSION"
19+
20+
# Build ; This cleans, too, see package.json
21+
npm run build
22+
23+
modify_atexit() {
24+
local file="$1"
25+
sed -i '39,48c\
26+
atexit()\
27+
{\
28+
if [ $isEulaAccepted == 1 ] ; then\
29+
if [ $NUMBER_OF_ARGS -eq 0 ] ; then\
30+
exec "$BIN" "--no-sandbox"\
31+
else\
32+
exec "$BIN" "${args[@]}" "--no-sandbox"\
33+
fi\
34+
fi\
35+
}' "$file"
36+
}
37+
38+
doAppImage() {
39+
local pkg="${PACKAGE_NAME}_x86_64.AppImage"
40+
echo "Processing $pkg..."
41+
if [ -f "dist/$pkg" ]; then
42+
cd ./dist/
43+
./"$pkg" --appimage-extract
44+
# cp -v ../AppRun ./squashfs-root/AppRun
45+
modify_atexit "./squashfs-root/AppRun"
46+
rm -rfv ./squashfs-root/locales/*
47+
# ../appimagetool-x86_64.AppImage squashfs-root "$PACKAGE_NAME.AppImage"
48+
echo "PWD: $(pwd) name: $pkg"
49+
if command -v ../bin/appimagetool-x86_64.AppImage &> /dev/null; then
50+
echo "Using appimagetool from PATH"
51+
../bin/appimagetool-x86_64.AppImage squashfs-root "$pkg"
52+
else
53+
# We are in GitLab CI/CD
54+
echo "Using local ../appimagetool-x86_64.AppImage"
55+
../appimagetool-x86_64.AppImage squashfs-root "$pkg"
56+
fi
57+
cd ..
58+
fi
59+
}
60+
61+
# Yeah :|
62+
63+
doAppImage
64+
65+
# cd ..
66+
67+
echo "In dist: $(ls -la ./dist/)"
68+
69+
# rm -v ./emulsion.desktop
70+
# rm -rfv ./DEBIAN/
71+
# rm -rfv ./out/
72+
73+
# rm -rfv ./squashfs-root/
74+
75+
echo "Post-build process for $PACKAGE_NAME v$PACKAGE_VERSION complete."

builder.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ extraResources:
2626

2727
publish:
2828
provider: github
29-
publishAutoUpdate: true
30-
releaseType: release
29+
publishAutoUpdate: false
3130

3231
linux:
3332
executableName: emulsion

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "emulsion",
3-
"version": "0.9.78",
3+
"version": "0.9.79",
44
"summary": "Better gaming throught chemistry",
55
"description": "Display your games collection into responsive galleries, manage game metadata, cover art and emulator configuration. Launch your games in style.",
66
"homepage": "https://yphil.gitlab.io/emulsion",
@@ -18,7 +18,7 @@
1818
"scripts": {
1919
"start": "electron . --no-sandbox",
2020
"prebuild": "rm -rf ./dist ./out ./node_modules ./repack ./tmp && npm install",
21-
"build": "electron-builder --config builder.yml --linux"
21+
"build": "electron-builder --config builder.yml --linux --publish=never"
2222
},
2323
"devDependencies": {
2424
"electron": "39.2.3",

0 commit comments

Comments
 (0)