Skip to content

Commit b5af02d

Browse files
so5iso4kaso5iso4ka
committed
feat(upstream): bump to 11.0.2
Signed-off-by: so5iso4ka <so5iso4ka@icloud.com>
2 parents ab169c2 + 9a9e857 commit b5af02d

617 files changed

Lines changed: 15701 additions & 7792 deletions

File tree

Some content is hidden

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

‎.clang-format‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ BraceWrapping:
1616
BreakBeforeBraces: Custom
1717
BreakConstructorInitializers: BeforeComma
1818
Cpp11BracedListStyle: false
19+
QualifierAlignment: Left

‎.clang-tidy‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,32 @@
1-
Checks:
2-
- modernize-use-using
3-
- readability-avoid-const-params-in-decls
4-
- misc-unused-parameters,
5-
- readability-identifier-naming
1+
FormatStyle: file
62

7-
# ^ Without unused-parameters the readability-identifier-naming check doesn't cause any warnings.
3+
Checks:
4+
"bugprone-*,clang-analyzer-*,cppcoreguidelines-*,hicpp-*,misc-*,modernize-*,performance-*,portability-*,readability-*,
5+
-*-magic-numbers,
6+
-*-non-private-member-variables-in-classes,
7+
-*-special-member-functions,
8+
-bugprone-easily-swappable-parameters,
9+
-cppcoreguidelines-owning-memory,
10+
-cppcoreguidelines-pro-type-static-cast-downcast,
11+
-modernize-use-nodiscard,
12+
-modernize-use-trailing-return-type,
13+
-portability-avoid-pragma-once,
14+
-readability-avoid-unconditional-preprocessor-if,
15+
-readability-function-cognitive-complexity,
16+
-readability-identifier-length,
17+
-readability-redundant-access-specifiers"
818

919
CheckOptions:
10-
- { key: readability-identifier-naming.ClassCase, value: PascalCase }
11-
- { key: readability-identifier-naming.EnumCase, value: PascalCase }
12-
- { key: readability-identifier-naming.FunctionCase, value: camelCase }
13-
- { key: readability-identifier-naming.GlobalVariableCase, value: camelCase }
14-
- { key: readability-identifier-naming.GlobalFunctionCase, value: camelCase }
15-
- { key: readability-identifier-naming.GlobalConstantCase, value: SCREAMING_SNAKE_CASE }
16-
- { key: readability-identifier-naming.MacroDefinitionCase, value: SCREAMING_SNAKE_CASE }
17-
- { key: readability-identifier-naming.ClassMemberCase, value: camelCase }
18-
- { key: readability-identifier-naming.PrivateMemberPrefix, value: m_ }
19-
- { key: readability-identifier-naming.ProtectedMemberPrefix, value: m_ }
20-
- { key: readability-identifier-naming.PrivateStaticMemberPrefix, value: s_ }
21-
- { key: readability-identifier-naming.ProtectedStaticMemberPrefix, value: s_ }
22-
- { key: readability-identifier-naming.PublicStaticConstantCase, value: SCREAMING_SNAKE_CASE }
23-
- { key: readability-identifier-naming.EnumConstantCase, value: PascalCase }
20+
misc-include-cleaner.MissingIncludes: false
21+
readability-identifier-naming.DefaultCase: "camelBack",
22+
readability-identifier-naming.NamespaceCase: "CamelCase"
23+
readability-identifier-naming.ClassCase: "CamelCase"
24+
readability-identifier-naming.ClassConstantCase: "CamelCase"
25+
readability-identifier-naming.EnumCase: "CamelCase"
26+
readability-identifier-naming.EnumConstantCase: "CamelCase"
27+
readability-identifier-naming.MacroDefinitionCase: "UPPER_CASE"
28+
readability-identifier-naming.ClassMemberPrefix: "m_"
29+
readability-identifier-naming.StaticConstantPrefix: "s_"
30+
readability-identifier-naming.StaticVariablePrefix: "s_"
31+
readability-identifier-naming.GlobalConstantPrefix: "g_"
32+
readability-implicit-bool-conversion.AllowPointerConditions: true

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Bug Report
22
description: File a bug report
3-
labels: [bug]
3+
labels: [ "bug: unconfirmed", "status: needs triage" ]
44
body:
55
- type: markdown
66
attributes:

‎.github/ISSUE_TEMPLATE/rfc.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template based on https://gitlab.archlinux.org/archlinux/rfcs/-/blob/0ba3b61e987e197f8d1901709409b8564958f78a/rfcs/0000-template.rst
22
name: Request for Comment (RFC)
33
description: Propose a larger change and start a discussion.
4-
labels: [rfc]
4+
labels: [ "type: enhancement", "status: needs discussion", "status: needs triage" ]
55
body:
66
- type: markdown
77
attributes:
@@ -44,8 +44,8 @@ body:
4444
attributes:
4545
label: Unresolved Questions
4646
description: |
47-
Are there any portions of your proposal which need to be discussed with the community before the RFC can proceed?
48-
Be careful here -- an RFC with a lot of remaining questions is likely to be stalled.
47+
Are there any portions of your proposal which need to be discussed with the community before the RFC can proceed?
48+
Be careful here -- an RFC with a lot of remaining questions is likely to be stalled.
4949
If your RFC is mostly unresolved questions and not too much substance, it may not be ready.
5050
placeholder: Do a lot of users care about the cat?
5151
validations:

‎.github/ISSUE_TEMPLATE/suggestion.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Suggestion
22
description: Make a suggestion
3-
labels: [enhancement]
3+
labels: [ "type: enhancement", "status: needs triage" ]
44
body:
55
- type: markdown
66
attributes:

‎.github/actions/package/linux/action.yml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,18 @@ runs:
2727
using: composite
2828

2929
steps:
30+
- name: Cleanup Qt installation on Linux
31+
shell: bash
32+
run: |
33+
rm -rf "$QT_PLUGIN_PATH"/printsupport
34+
rm -rf "$QT_PLUGIN_PATH"/sqldrivers
35+
rm -rf "$QT_PLUGIN_PATH"/help
36+
rm -rf "$QT_PLUGIN_PATH"/designer
37+
rm -rf "$QT_PLUGIN_PATH"/qmltooling
38+
rm -rf "$QT_PLUGIN_PATH"/qmlls
39+
rm -rf "$QT_PLUGIN_PATH"/qmllint
40+
rm -rf "$QT_PLUGIN_PATH"/platformthemes/libqgtk3.so
41+
3042
- name: Setup build variables
3143
shell: bash
3244
run: |
@@ -63,7 +75,7 @@ runs:
6375
if [ '${{ inputs.gpg-private-key-id }}' != '' ]; then
6476
echo "$GPG_PRIVATE_KEY" > privkey.asc
6577
gpg --import privkey.asc
66-
gpg --export --armor 9C7A2C9B62603299 > pubkey.asc
78+
gpg --export --armor ${{ inputs.gpg-private-key-id }} > pubkey.asc
6779
else
6880
echo ":warning: Skipped code signing for Linux AppImage, as gpg key was not present." >> $GITHUB_STEP_SUMMARY
6981
fi
@@ -78,6 +90,10 @@ runs:
7890
# FIXME(@getchoo): gamemode doesn't seem to be very portable with DBus. Find a way to make it work!
7991
find "$INSTALL_APPIMAGE_DIR" -name '*gamemode*' -exec rm {} +
8092
93+
#disable OpenGL and Vulkan launcher features until https://github.com/VHSgunzo/sharun/issues/35
94+
echo "PRISMLAUNCHER_DISABLE_GLVULKAN=1" >> "$INSTALL_APPIMAGE_DIR"/.env
95+
#makes the launcher use portals for file picking
96+
echo "QT_QPA_PLATFORMTHEME=xdgdesktopportal" >> "$INSTALL_APPIMAGE_DIR"/.env
8197
ln -s org.freesmTeam.freesmlauncher.metainfo.xml "$INSTALL_APPIMAGE_DIR"/share/metainfo/org.freesmTeam.freesmlauncher.appdata.xml
8298
ln -s share/applications/org.freesmTeam.freesmlauncher.desktop "$INSTALL_APPIMAGE_DIR"
8399
ln -s share/icons/hicolor/256x256/apps/org.freesmTeam.freesmlauncher.png "$INSTALL_APPIMAGE_DIR"
@@ -119,19 +135,19 @@ runs:
119135
tar -czf ../FreesmLauncher-portable.tar.gz *
120136
121137
- name: Upload binary tarball
122-
uses: actions/upload-artifact@v6
138+
uses: actions/upload-artifact@v7
123139
with:
124140
name: FreesmLauncher-${{ inputs.artifact-name }}-Qt6-Portable-${{ inputs.version }}-${{ inputs.build-type }}
125141
path: FreesmLauncher-portable.tar.gz
126142

127143
- name: Upload AppImage
128-
uses: actions/upload-artifact@v6
144+
uses: actions/upload-artifact@v7
129145
with:
130146
name: FreesmLauncher-${{ runner.os }}-${{ inputs.version }}-${{ inputs.build-type }}-${{ env.APPIMAGE_ARCH }}.AppImage
131147
path: FreesmLauncher-${{ runner.os }}-*${{ env.APPIMAGE_ARCH }}.AppImage
132148

133149
- name: Upload AppImage Zsync
134-
uses: actions/upload-artifact@v6
150+
uses: actions/upload-artifact@v7
135151
with:
136152
name: FreesmLauncher-${{ runner.os }}-${{ inputs.version }}-${{ inputs.build-type }}-${{ env.APPIMAGE_ARCH }}.AppImage.zsync
137153
path: FreesmLauncher-${{ runner.os }}-*${{ env.APPIMAGE_ARCH }}.AppImage.zsync

‎.github/actions/package/macos/action.yml‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,36 @@ runs:
9696
fi
9797
ditto -c -k --sequesterRsrc --keepParent "Freesm Launcher.app" ../FreesmLauncher.zip
9898
99+
- name: Create DMG
100+
shell: bash
101+
env:
102+
INSTALL_DIR: install
103+
run: |
104+
cd ${{ env.INSTALL_DIR }}
105+
106+
mkdir -p src
107+
cp -R "Prism Launcher.app" src/
108+
109+
ln -s /Applications src/
110+
111+
hdiutil create \
112+
-volname "Freesm Launcher ${{ inputs.version }}" \
113+
-srcfolder src \
114+
-ov -format ULMO \
115+
"../PrismLauncher.dmg"
116+
99117
- name: Make Sparkle signature
100118
shell: bash
101119
run: |
102120
if [ '${{ inputs.sparkle-ed25519-key }}' != '' ]; then
103121
echo '${{ inputs.sparkle-ed25519-key }}' > ed25519-priv.pem
104-
signature=$(/opt/homebrew/opt/openssl@3/bin/openssl pkeyutl -sign -rawin -in ${{ github.workspace }}/FreesmLauncher.zip -inkey ed25519-priv.pem | openssl base64 | tr -d \\n)
122+
signature_zip=$(/opt/homebrew/opt/openssl@3/bin/openssl pkeyutl -sign -rawin -in ${{ github.workspace }}/FreesmLauncher.zip -inkey ed25519-priv.pem | openssl base64 | tr -d \\n)
123+
signature_dmg=$(/opt/homebrew/opt/openssl@3/bin/openssl pkeyutl -sign -rawin -in ${{ github.workspace }}/FreesmLauncher.dmg -inkey ed25519-priv.pem | openssl base64 | tr -d \\n)
105124
rm ed25519-priv.pem
106125
cat >> $GITHUB_STEP_SUMMARY << EOF
107126
### Artifact Information :information_source:
108-
- :memo: Sparkle Signature (ed25519): \`$signature\`
127+
- :memo: Sparkle Signature (ed25519): \`$signature_zip\` (ZIP)
128+
- :memo: Sparkle Signature (ed25519): \`$signature_dmg\` (DMG)
109129
EOF
110130
else
111131
cat >> $GITHUB_STEP_SUMMARY << EOF
@@ -115,7 +135,13 @@ runs:
115135
fi
116136
117137
- name: Upload binary tarball
118-
uses: actions/upload-artifact@v6
138+
uses: actions/upload-artifact@v7
119139
with:
120140
name: FreesmLauncher-${{ inputs.artifact-name }}-${{ inputs.version }}-${{ inputs.build-type }}
121141
path: FreesmLauncher.zip
142+
143+
- name: Upload disk image
144+
uses: actions/upload-artifact@v7
145+
with:
146+
name: PrismLauncher-${{ inputs.artifact-name }}-${{ inputs.version }}-${{ inputs.build-type }}.dmg
147+
path: PrismLauncher.dmg

‎.github/actions/package/windows/action.yml‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,25 +61,26 @@ runs:
6161
6262
- name: Login to Azure
6363
if: ${{ env.CI_HAS_ACCESS_TO_AZURE != '' && inputs.azure-client-id != '' }}
64-
uses: azure/login@v2
64+
uses: azure/login@v3
6565
with:
6666
client-id: ${{ inputs.azure-client-id }}
6767
tenant-id: ${{ inputs.azure-tenant-id }}
6868
subscription-id: ${{ inputs.azure-subscription-id }}
6969

7070
- name: Sign executables
7171
if: ${{ env.CI_HAS_ACCESS_TO_AZURE != '' && inputs.azure-client-id != '' }}
72-
uses: azure/trusted-signing-action@v0
72+
uses: azure/artifact-signing-action@v1
7373
with:
7474
endpoint: https://eus.codesigning.azure.net/
7575
trusted-signing-account-name: FreesmLauncher
7676
certificate-profile-name: FreesmLauncher
77-
78-
files: |
79-
${{ github.workspace }}\install\freesmlauncher.exe
80-
${{ github.workspace }}\install\freesmlauncher_filelink.exe
81-
${{ github.workspace }}\install\freesmlauncher_updater.exe
82-
77+
files-folder: ${{ github.workspace }}\install\
78+
files-folder-filter: dll,exe
79+
files-folder-recurse: true
80+
files-folder-depth: 2
81+
# recommended in https://github.com/Azure/artifact-signing-action#timestamping-1
82+
timestamp-rfc3161: 'http://timestamp.acs.microsoft.com'
83+
timestamp-digest: 'SHA256'
8384
# TODO(@getchoo): Is this all really needed???
8485
# https://github.com/Azure/trusted-signing-action/blob/fc390cf8ed0f14e248a542af1d838388a47c7a7c/docs/OIDC.md
8586
exclude-environment-credential: true
@@ -141,7 +142,7 @@ runs:
141142
142143
- name: Sign installer
143144
if: ${{ env.CI_HAS_ACCESS_TO_AZURE != '' && inputs.azure-client-id != '' }}
144-
uses: azure/trusted-signing-action@v0
145+
uses: azure/artifact-signing-action@v1
145146
with:
146147
endpoint: https://eus.codesigning.azure.net/
147148
trusted-signing-account-name: FreesmLauncher
@@ -150,6 +151,9 @@ runs:
150151
files: |
151152
${{ github.workspace }}\FreesmLauncher-Setup.exe
152153
154+
# recommended in https://github.com/Azure/artifact-signing-action#timestamping-1
155+
timestamp-rfc3161: 'http://timestamp.acs.microsoft.com'
156+
timestamp-digest: 'SHA256'
153157
# TODO(@getchoo): Is this all really needed???
154158
# https://github.com/Azure/trusted-signing-action/blob/fc390cf8ed0f14e248a542af1d838388a47c7a7c/docs/OIDC.md
155159
exclude-environment-credential: true
@@ -164,19 +168,19 @@ runs:
164168
exclude-interactive-browser-credential: true
165169

166170
- name: Upload binary zip
167-
uses: actions/upload-artifact@v6
171+
uses: actions/upload-artifact@v7
168172
with:
169173
name: FreesmLauncher-${{ inputs.artifact-name }}-${{ inputs.version }}-${{ inputs.build-type }}
170174
path: install/**
171175

172176
- name: Upload portable zip
173-
uses: actions/upload-artifact@v6
177+
uses: actions/upload-artifact@v7
174178
with:
175179
name: FreesmLauncher-${{ inputs.artifact-name }}-Portable-${{ inputs.version }}-${{ inputs.build-type }}
176180
path: install-portable/**
177181

178182
- name: Upload installer
179-
uses: actions/upload-artifact@v6
183+
uses: actions/upload-artifact@v7
180184
with:
181185
name: FreesmLauncher-${{ inputs.artifact-name }}-Setup-${{ inputs.version }}-${{ inputs.build-type }}
182186
path: FreesmLauncher-Setup.exe

‎.github/actions/setup-dependencies/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ runs:
5555
# TODO(@getchoo): Get this working on MSYS2!
5656
- name: Setup ccache
5757
if: ${{ (runner.os != 'Windows' || inputs.msystem == '') && inputs.build-type == 'Debug' }}
58-
uses: hendrikmuhs/ccache-action@v1.2.20
58+
uses: hendrikmuhs/ccache-action@v1.2.22
5959
with:
6060
variant: sccache
6161
create-symlink: ${{ runner.os != 'Windows' }}

‎.github/actions/setup-dependencies/linux/action.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: Setup Linux dependencies
2+
description: Install and setup dependencies for building Prism Launcher
23

34
runs:
45
using: composite
@@ -12,7 +13,7 @@ runs:
1213
dpkg-dev \
1314
ninja-build extra-cmake-modules pkg-config scdoc \
1415
cmark gamemode-dev libarchive-dev libcmark-dev libqrencode-dev zlib1g-dev \
15-
libxcb-cursor-dev libtomlplusplus-dev
16+
libxcb-cursor-dev libtomlplusplus-dev libvulkan-dev
1617
1718
- name: Setup AppImage tooling
1819
shell: bash

0 commit comments

Comments
 (0)