ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity
9,434 Commits 4 Branches 5 Tags 40 MiB
8555ede5c4
Commit Graph

327 Commits

Author SHA1 Message Date
Evan Goode
35131193dd Merge remote-tracking branch 'upstream/release-9.x' into develop 2025-04-06 18:23:05 -04:00
Seth Flynn
0f21e01b46
ci: don't install libfuse2 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 671aad88f52e3fbba872e80f2805c0c5c64b7a8d)
 2025-03-26 21:15:39 -04:00
Seth Flynn
88109eaa71
ci: pin appimage tooling 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 5d5155bb22f9935e17e33008a644736404629928)
 2025-03-26 21:15:39 -04:00
Seth Flynn
1425c9801e
ci: use bundled linuxdeploy appimage plugin 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 6ef59fe984777e2620b445a78493afb86074eb8b)
 2025-03-26 21:15:39 -04:00
Alexandru Ionut Tripon
2bf6d66615 Update .github/workflows/build.yml 
Co-authored-by: Seth Flynn <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit db766574a42a4b7db6b320b6d469b233ce5f3100)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-02-16 15:54:15 -05:00
Alexandru Ionut Tripon
abd55c9d38 Update .github/workflows/build.yml 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 1b5d3c2bf903bbcade7b38c22c0b103a0c6999f8)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-02-16 15:54:15 -05:00
Trial97
c45000eac3 remove specific step for qt6 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit be3eca8c97fdbb8daede84cab20fbd7695334242)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-02-16 15:54:15 -05:00
Trial97
162188eaec fix appimage 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit bca517b8d3cd685540beebf69fbc1f80fe0a6ce4)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-02-16 15:54:15 -05:00
Seth Flynn
702db71f61
ci: separate flatpak job 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 49d734f3142328a71506b28c8c1cdcb99788c34d)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-29 16:06:27 -05:00
Seth Flynn
8e8efc304f
ci: separate nix job 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 417688089d756da23ca3f482a32871963d289211)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-29 16:06:27 -05:00
Alexandru Ionut Tripon
0508bbd05f
Merge pull request #3331 from getchoo-contrib/backport-ubuntu-22.04 
[Backport release-9.x] Use Ubuntu 22.04 for Linux builds
 2025-01-21 09:08:46 +02:00
Alexandru Ionut Tripon
ea0d710aaf
Update .github/workflows/build.yml 
Co-authored-by: Seth Flynn <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit db766574a42a4b7db6b320b6d469b233ce5f3100)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-20 23:47:00 -05:00
Alexandru Ionut Tripon
02e1988779
Update .github/workflows/build.yml 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 1b5d3c2bf903bbcade7b38c22c0b103a0c6999f8)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-20 23:46:59 -05:00
Trial97
fdab044c04
remove specific step for qt6 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit be3eca8c97fdbb8daede84cab20fbd7695334242)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-20 23:46:59 -05:00
Trial97
e77ac36c3f
fix appimage 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit bca517b8d3cd685540beebf69fbc1f80fe0a6ce4)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-20 23:46:59 -05:00
Edgars Cirulis
0d06fae7ae
chore: update Qt to 6.8.1 
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
(cherry picked from commit eb8c375ec5023bbc7c02e45d63da866058e56b26)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-20 19:09:02 -05:00
Edgars Cirulis
a0c4cc59ac
ci: uprev qt install action to v4 
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
(cherry picked from commit 0beaa94311a00cdc02ef5ff7d182849fce419aa9)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-20 19:09:02 -05:00
Edgars Cirulis
bd7371dbf1
ci: fix qt-6.8 workflow 
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
(cherry picked from commit b39098dbc5b371e31ce585f7534ffdb00096c2b5)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-20 19:09:02 -05:00
Edgars Cirulis
d7756d29dc
chore: update Qt to 6.8.0 
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
(cherry picked from commit 5b6d551650e4590567321647ce68ae2043a8180c)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-20 19:09:01 -05:00
seth
ed2b5d4b0e
ci: build flatpaks for arm 
Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit 66f0397087d9b88c93e69c5e26a138d235344546)
Signed-off-by: seth <getchoo@tuta.io>
 2025-01-19 19:47:44 -05:00
seth
9f199a470c
ci: build nix packages for aarch64-linux 
Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit 8e8538b506b5f3ae2b2424599078966600bb764c)
Signed-off-by: seth <getchoo@tuta.io>
 2025-01-19 19:47:39 -05:00
Evan Goode
594fa981ea Merge remote-tracking branch 'prismlauncher/release-9.x' into develop 2025-01-11 19:05:25 -05:00
renovate[bot]
a58f125535 chore(deps): update actions/cache action to v4.2.0 
(cherry picked from commit 94c893bd865ceba286dffc1d6392df07d47c11d9)
 2024-12-06 06:47:20 +00:00
guihkx
bbf21e5824 ci(flatpak): update build artifact name 
Just aligning the name of the Flatpak package with other build artifacts.

Signed-off-by: guihkx <626206+guihkx@users.noreply.github.com>
(cherry picked from commit e0faee7f262fda898ceb8ea5ab40249dbd6c52ea)
 2024-12-02 15:30:33 +00:00
guihkx
73b4223b61 flatpak: update KDE runtime to 6.8 
This also switches to the Docker image provided and maintained by
Flathub collaborators through the 'flathub-infra' organization on
GitHub, because it looks better maintained at the moment.

Signed-off-by: guihkx <626206+guihkx@users.noreply.github.com>
(cherry picked from commit f6770a847a8419ef0b1acab30144077f745a48ee)
 2024-12-02 15:30:33 +00:00
Rachel Powers
7f074ca7b9 ci: libxcb-curcsor_dev ? 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit ba6743d134589294ac3ba754e6ad83c2e59d4ffd)
 2024-11-05 10:25:53 +00:00
Rachel Powers
c0394c52b7 ci: bump linux qt version 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit d63a3364111a99337c2096c807550f3d7c62b47a)
 2024-11-05 10:25:53 +00:00
Evan Goode
c15afbda4a Fix build? 2024-10-26 16:12:01 -04:00
Evan Goode
7dbaa896a6 Merge tag '9.0' into develop 
This is an intermediate/halfway commit, more refactoring is needed to
get this to build.
 2024-10-25 15:34:57 -04:00
renovate[bot]
98819a0d02 chore(deps): update actions/cache action to v4.1.2 
(cherry picked from commit 210d0d8aa25578cbbf8250797504ae1652544600)
 2024-10-25 06:30:00 +00:00
Trial97
9a810dfa6e fix sparkle signature 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 0586d38e03)
 2024-10-20 21:07:55 +00:00
renovate[bot]
093313e591
chore(deps): update actions/cache action to v4.1.1 2024-10-09 07:14:47 +00:00
seth
e2b346fc53
Merge pull request #2888 from PrismLauncher/renovate/actions-cache-4.x 
chore(deps): update actions/cache action to v4.1.0
 2024-10-08 13:15:05 -04:00
seth
7c45f88769
Merge pull request #2883 from PrismLauncher/renovate/cachix-install-nix-action-30.x 
chore(deps): update cachix/install-nix-action action to v30
 2024-10-08 13:14:47 -04:00
TheKodeToad
a200fca45c
Merge pull request #2869 from Edgars-Cirulis/patch-1 
chore: update Qt to 6.7.3
 2024-10-08 12:36:11 +01:00
Alexandru Ionut Tripon
dc1f56e108
Merge pull request #2865 from Ryex/nsis_vc_redist 
add vc_redist as a NSIS install section
 2024-10-08 14:09:22 +03:00
renovate[bot]
cc0c9d208d
chore(deps): update actions/cache action to v4.1.0 2024-10-04 22:22:10 +00:00
Rachel Powers
a61c93bede
Update .github/workflows/build.yml 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-04 07:06:19 -07:00
Rachel Powers
023aa18e85
ci: NSCurl only needed on MSVC 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-03 23:14:29 -07:00
Rachel Powers
bcb1d456d4
fix: version NSCurl plugin in workflow, detect and use arm64 vc_redist for arm64 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-03 21:56:19 -07:00
renovate[bot]
010678da53
chore(deps): update cachix/install-nix-action action to v30 2024-10-03 13:46:28 +00:00
renovate[bot]
79be2fc062
chore(deps): update cachix/install-nix-action action to v29 2024-10-01 00:32:42 +00:00
seth
5adca58337
ci: add nix job 
Signed-off-by: seth <getchoo@tuta.io>
 2024-09-30 16:25:56 -04:00
Rachel Powers
ed15a28eb3
fix : baking the redist into the installer breaks GPL, download at runtime instead 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-09-28 14:58:13 -07:00
Edgars Cīrulis
a897b012d9
chore: update Qt to 6.7.3 
Only bug fixes no new / breaking changes 

Signed-off-by: Edgars Cīrulis <edgarsciruliss@gmail.com>
 2024-09-28 12:11:25 +03:00
Alexandru Ionut Tripon
914ae6ead6
Use macOS 14 in CI (#2826) 
* chore: fix mac CI build

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

* try what the error says

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

* set -DCMAKE_OSX_ARCHITECTURES=x86_64

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

---------

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 13:00:38 -04:00
Trial97
2c2defb266
add Launcher_ prefix to enable java option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 14:30:23 +03:00
Trial97
b5bbe93775 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-17 00:20:40 +03:00
renovate[bot]
128827cef5
chore(deps): update hendrikmuhs/ccache-action action to v1.2.14 2024-08-05 20:02:40 +00:00
Edgars Cirulis
d3ca8864c2
chore: update Qt to 6.7.2 
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
 2024-07-12 23:54:22 +03:00