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

306 Commits

Author SHA1 Message Date
DioEgizio
4642c13ca4
fix: include libbz2.so.1.0 
fixes portable installs not working on fedora anymore

i did this only on portable builds and not system installs so that it doesn't create problems to people packaging them, as to fix system installs i would have to put it in bin/

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-03-28 14:42:04 +02:00
Alexandru Ionut Tripon
ccf3a1582d
Merge pull request #2231 from DioEgizio/bzip2-fix 
fix: include libbz2.so.1.0
 2024-03-27 16:19:53 +02:00
Evan Goode
96b4933326 Merge Prism Launcher 8.2 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-03-21 10:59:32 -04:00
DioEgizio
37d348e60e fix: include libbz2.so.1.0 
fixes portable installs not working on fedora anymore

i did this only on portable builds and not system installs so that it doesn't create problems to people packaging them, as to fix system installs i would have to put it in bin/

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-03-21 10:39:12 +01:00
renovate[bot]
7ffebcad72
chore(deps): update actions/cache action to v4.0.2 2024-03-19 17:41:32 +00:00
renovate[bot]
e1146455a3
chore(deps): update actions/cache action to v4.0.1 2024-02-29 23:16:59 +00:00
DioEgizio
c6441d231b fix: fix sparkle signing 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-22 11:53:48 +01:00
DioEgizio
4421746c0e fix: fix sparkle signing 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-22 10:00:21 +01:00
DioEgizio
d8e34e6c39 Merge pull request #2130 from DioEgizio/updates 2024-02-18 12:58:09 +01:00
DioEgizio
5d36067c74 chore: update libraries 
updated qt to 6.6.2
updated some submodules
updated sparkle framework to the latest version

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-16 16:21:53 +01:00
renovate[bot]
ab4974629c
chore(deps): update hendrikmuhs/ccache-action action to v1.2.12 2024-01-26 07:12:13 +00:00
Sefa Eyeoglu
bcb5b9c9c2
Merge pull request #2034 from Scrumplex/feat/macos-signing 2024-01-18 17:00:00 +01:00
Sefa Eyeoglu
2c0274159f
Merge pull request #2034 from Scrumplex/feat/macos-signing 2024-01-18 16:56:39 +01:00
renovate[bot]
bfd1262c14
chore(deps): update actions/cache action to v4 2024-01-17 20:29:50 +00:00
Sefa Eyeoglu
de9232783e
chore: remove cachix auth token secret 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2024-01-17 13:12:38 +01:00
Sefa Eyeoglu
27c52eff8b
feat: add macOS notarization 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2024-01-17 13:12:36 +01:00
Sefa Eyeoglu
baebef982e
feat: add macOS code signing 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2024-01-17 13:10:14 +01:00
renovate[bot]
b0f65476d9
chore(deps): update actions/cache action to v3.3.3 2024-01-11 18:59:17 +00:00
renovate[bot]
73f956c897
chore(deps): update hendrikmuhs/ccache-action action to v1.2.11 2024-01-02 07:30:12 +00:00
renovate[bot]
317d52b44a
chore(deps): update actions/upload-artifact action to v4 2023-12-14 20:23:30 +00:00
DioEgizio
1ba6ed9fe9 chore: update qt to qt 6.6.1 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit eb011e6729)
 2023-12-11 10:00:43 +00:00
DioEgizio
eb011e6729 chore: update qt to qt 6.6.1 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-12-02 17:42:24 +01:00
guihkx
e3b7aed76b
chore: sync local flatpak manifest with flathub's 
Signed-off-by: guihkx <626206+guihkx@users.noreply.github.com>
 2023-11-19 11:08:52 -03:00
Evan Goode
9430026192 Merge tag '8.0' into unmojang-8.0 
Upstream changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/8.0

(Imcomplete) list of changes in 8.0 relevant to PollyMC:
- Prism has dropped support for Mojang accounts
  - https://github.com/PrismLauncher/PrismLauncher/pull/1656
  - Added it back to PollyMC primarily since the Mojang authentication
    code is also used for authlib-injector accounts. Some users may also
    still want to be able to log in to Mojang accounts for some reason:
    https://github.com/fn2006/PollyMC/issues/115#issuecomment-1805384658,
    even if they do not provide authentication to multiplayer servers.
  - To my surprise, I could still log in to a Mojang account, get its
    skin, and launch the game. Authentication to servers, of course, did
    not work.
  - Tested: logging into authlib-injector, Mojang, and MSA accounts and
    launching the game.
- Prism has added a built-in updater for Windows and Linux that I assume
  provides similar functionality to Sparkle on macOS:
  https://github.com/PrismLauncher/PrismLauncher/pull/1268. There is a
  Launcher_UPDATER_GITHUB_REPO variable in CMakeLists.txt that specifies
  the repo checked by the updater. I have changed this to the PollyMC
  repository, and since PollyMC follows almost the same CI/release
  patterns as Prism Launcher, it might work with PollyMC, too, but I
  have not tested it yet.
- Add macOS support to Nix
  - https://github.com/PrismLauncher/PrismLauncher/pull/1485
  - Untested
- The "PollyMC-Linux-8.0.tar.gz" and similar build artifacts were
  renamed to "PollyMC-Linux-8.0-Qt5.tar.gz" to match their
  "PollyMC-Linux-8.0-Qt6.tar.gz" counterparts.
- Removed Windows MSVC Legacy builds
- Removed Quilt Beacon toggle, the beacon is now always disabled:
  https://github.com/PrismLauncher/PrismLauncher/pull/1547,
  https://github.com/PrismLauncher/meta/pull/23
- Prism removed FTB support in 7.0, but I tested creating an FTB
  instance to make sure it still works in 8.0

Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-15 14:37:14 -05:00
Trial97
b1bd0ceade
fixed code signing for appImage 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-17 09:29:47 +03:00
Tayou
aae65e3e4e
Merge branch 'develop' into update-qt660 
Signed-off-by: Tayou <git@tayou.org>
 2023-10-16 19:57:05 +02:00
DioEgizio
6c9856b9dc chore: bump Qt to Qt 6.6.0 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-10-16 15:42:16 +02:00
Trial97
ef0813754b
added explicit qt version for linux portable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-15 20:23:46 +03:00
Trial97
6bbff310bc
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 2023-10-15 17:42:39 +03:00
Trial97
b67c2c71d1
removed windows legacy builds 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-05 22:44:49 +03:00
Trial97
606c12ffeb
more fixing 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 18:47:21 +03:00
Trial97
ebde563648
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 2023-09-26 20:16:46 +03:00
renovate[bot]
e7d6be531f
chore(deps): update actions/cache action to v3.3.2 2023-09-08 17:22:12 +00:00
renovate[bot]
7dd2530027
chore(deps): update actions/checkout action to v4 2023-09-04 15:02:01 +00:00
fn2006
b6904ba50a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-09-04 00:39:20 +01:00
Trial97
1faf741004
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 13:29:42 +03:00
Trial97
0ba88ff138
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into staging 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 00:33:24 +03:00
fn2006
847430b113 Merge branch 'release-7.x' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-10 10:09:08 +01:00
renovate[bot]
d9cd6f9c50
chore(deps): update hendrikmuhs/ccache-action action to v1.2.10 2023-08-08 18:20:26 +00:00
Sefa Eyeoglu
7004388105
Merge pull request #1227 from Ryex/packaging/appimage-updates 2023-08-07 13:18:06 +02:00
Rachel Powers
9a9a4fcfd4
Apply suggestions from code review 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-08-06 13:16:30 -07:00
DioEgizio
b013133cc1 chore: update to qt 6.5.2 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-08-03 09:24:47 +02:00
Rachel Powers
7c1a465ec9
Merge branch 'develop' into feat/launcher-updater 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 14:19:31 -07:00
seth
b92d617df0 chore(ci): remove nix job 
we're using garnix now

Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit fbf29274e8)
 2023-07-26 13:47:58 +00:00
seth
fbf29274e8
chore(ci): remove nix job 
we're using garnix now

Signed-off-by: seth <getchoo@tuta.io>
 2023-07-25 19:23:17 -04:00
Sefa Eyeoglu
82a9e7d372 fix(actions): set all build platforms to official 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 40fb387185)
 2023-07-16 21:16:11 +00:00
seth
7ed15b2687
Merge pull request #1214 from PrismLauncher/renovate/cachix-install-nix-action-22.x 
chore(deps): update cachix/install-nix-action action to v22
 2023-07-16 20:42:24 +02:00
Sefa Eyeoglu
3d502b12a9
Merge pull request #1224 from DioEgizio/add-appstream 2023-07-16 19:59:30 +02:00
seth
f0d1df9139
Merge pull request #1210 from getchoo/opengl-appimage 
fix(appimage): bundle generic opengl lib
 2023-07-16 19:59:30 +02:00
Rachel Powers
cd527c44a4
fix(updater): build atrifact fix on linux ci + add qt-ver to artifact name 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-30 18:17:06 -07:00
Rachel Powers
6f7454243e
fix: prep for changes in #1276 
- sign updater

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-26 23:25:07 -07:00
Sefa Eyeoglu
40fb387185
fix(actions): set all build platforms to official 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-26 11:58:47 +02:00
Rachel Powers
275351e19c
Merge branch 'packaging/appimage-updates' into feat/launcher-updater 2023-06-25 13:51:01 -07:00
Rachel Powers
e099a3f7e8
feat(updater): packaging - know the updater git repo 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:47:32 -07:00
Rachel Powers
3d3acb7a92
Merge branch 'packaging/appimage-updates' into feat/launcher-updater 2023-06-25 13:47:31 -07:00
Rachel Powers
5d03919b59
Merge branch 'packaging/file-manifest-in-portable-install' into feat/windows-updater 2023-06-25 13:47:30 -07:00
Rachel Powers
0e7f435921
echo to correct var for summary 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-23 20:56:07 -07:00
fn2006
13b2c15abc
Add Flatpak build (#72) 2023-06-21 14:20:49 +00:00
Rachel Powers
f8a02a5c9b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into packaging/appimage-updates 2023-06-19 01:41:14 -07:00
Rachel Powers
6685810081
packaging: sign appimages with gpg 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-19 01:34:14 -07:00
Rachel Powers
53d40df292
packaging: add appimage update capability 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

packaging(linux): use vars when refrencing qt install dir

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

packaging(appimage): dont use rsync

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

packaging: use runner.workspace when copying files

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

packaging(appimage): put zsync in relase:x

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

use with:token insted of env for GITHUB_TOKEN (which is depricated)

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

fix: appimage zsync needs consistant filenames across verisons

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

upload proper zsync

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

fix: non versioned appimage filename

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-19 00:49:03 -07:00
DioEgizio
d5b5f0503c chore: change xml name to what linuxdeploy wants 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-06-19 09:17:15 +02:00
DioEgizio
555cb40efd chore: install appstream in appimage 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-06-19 09:17:15 +02:00
seth
9d22fce53f
Merge pull request #1214 from PrismLauncher/renovate/cachix-install-nix-action-22.x 
chore(deps): update cachix/install-nix-action action to v22
 2023-06-18 22:06:47 -04:00
renovate[bot]
b123f4f948
chore(deps): update cachix/install-nix-action action to v22 2023-06-16 21:58:32 +00:00
seth
45cce1d19a
fix(appimage): bundle generic opengl lib 
Signed-off-by: seth <getchoo@tuta.io>
 2023-06-16 14:34:44 -04:00
Sayantan Chaudhuri
b2c9183c41
Fix tabs with spaces in build.yml (#65) 
* Fix tabs with spaces

* Switching to manual dispatch for the built workflow

This is for private testing

* Switching to simpler manual dispatch trigger

* Back to original trigger
 2023-06-12 17:23:01 +00:00
fn2006
a3e64b6f1b fix typo 2023-06-09 16:23:27 +01:00
fn2006
a13d3f4a38 Attempt to get flatpak builds working 2023-06-09 16:20:36 +01:00
fn2006
cc85b44ff2 Merge branch 'release-7.x' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-09 13:35:03 +01:00
DioEgizio
75b1eaed0c
chore: bump macOS requirement to 11.0 
Noticed only now that Qt 6.5 bumps the macOS requirement to macOS 11.
This was basically already effective in prism since with the Qt 6.5 bump pr macOS 10.15 user's wouldn't be able to run this, but updating the requirement here makes it more clear for the end user trying to run prism on macOS 10.15

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-06-08 17:12:49 +02:00
DioEgizio
5b3431b268
chore: revert macOS Qt version back to 6.5.0 
Qt 6.5.1 seems to cause issues with Rectangle

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-06-08 14:55:09 +02:00
Rachel Powers
3a068970f9
Packaging: file manifest in portable install (#1101) 2023-06-06 16:03:13 +02:00
Rachel Powers
ab41816265 packaging: use runner.workspace when copying files 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-04 12:27:01 -07:00
Rachel Powers
2c95973446 packaging(appimage): dont use rsync 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-04 10:36:34 -07:00
Rachel Powers
89d8f9b829 packaging(linux): use vars when refrencing qt install dir 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-03 22:43:41 -07:00
Rachel Powers
0bda885bbf packaging: add appimage update capability 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-03 21:56:46 -07:00
Rachel Powers
46a13c8767 packaging: fix typo ; in middle of line 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-31 20:16:58 -07:00
Rachel Powers
3bbe33132a packaging: convert msys paths 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-31 19:39:14 -07:00
Rachel Powers
b48540dc32 packaging: trim leading working dir from manifest paths 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-31 16:27:53 -07:00
Rachel Powers
4e0a08345d packaging: add manifest.txt to linux tarballs 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-31 16:07:29 -07:00
Rachel Powers
9b1e0eb57d packaging: msys2 shell is bash 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-31 16:01:31 -07:00
Rachel Powers
4cbae0a751 packaging: trim manfest paths to be relative 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-31 15:36:25 -07:00
Rachel Powers
68c2833552 packaging: use powershell name 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-31 14:55:13 -07:00
Rachel Powers
dbe14c6be5 packaging: ensure all files are in manifest 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-31 14:54:06 -07:00
Rachel Powers
7c85462ff3 packaging: include file manifest in portable install 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-31 14:31:38 -07:00
fn2006
a951bd1c3e Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-30 17:59:26 +01:00
Sefa Eyeoglu
f24211e8b5
Merge pull request #1088 from DioEgizio/update-qt651 
chore: update to Qt 6.5.1
 2023-05-26 07:31:18 +02:00
DioEgizio
70983c7269 chore: update to Qt 6.5.1 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-05-25 16:38:24 +02:00
renovate[bot]
42f9eccb17
chore(deps): update cachix/install-nix-action action to v21 2023-05-24 14:21:39 +00:00
Sefa Eyeoglu
64ba5e4ed1
Merge pull request #833 from Ryex/advanced_copy_instance 2023-05-02 12:11:41 +02:00
renovate[bot]
51095c5a27
chore(deps): update hendrikmuhs/ccache-action action to v1.2.9 2023-04-14 06:31:06 +00:00
DioEgizio
371c839573 chore: update Qt to 6.5.0 on Windows 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-04-08 19:38:46 +02:00
DioEgizio
0cf1fc72a3 chore: update to qt 6.5.0 on macos 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-04-03 18:01:23 +02:00
renovate[bot]
732bc53692
chore(deps): update flatpak/flatpak-github-actions action to v6 2023-04-02 03:14:42 +00:00
Rachel Powers
a96519cbdc workflow: add filelink.exe to SignTool call 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:33 -07:00
DioEgizio
d2f674e08f chore: update qt6 to 6.4.3 on windows and macos 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-03-19 17:11:16 +01:00
Sefa Eyeoglu
15a0c03664
Merge pull request #928 from PrismLauncher/renovate/actions-cache-3.x 
chore(deps): update actions/cache action to v3.3.1
 2023-03-13 18:14:35 +01:00
Sefa Eyeoglu
4b36d1e3ea
chore: drop Snap packaging 
We do not have a lot of expertise dealing with Snap and as it is
currently breaking our CI, it might be good to drop support for it.

This does not mean that it won't come back in the future, but as it
stands, it was effectively unmaintained and was only used for nightly
builds anyway.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-13 15:33:23 +01:00
renovate[bot]
20525bec29
chore(deps): update actions/cache action to v3.3.1 2023-03-13 10:50:27 +00:00