-
Notifications
You must be signed in to change notification settings - Fork 676
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add Snap build/publish Github action #6805
base: master
Are you sure you want to change the base?
Changes from 12 commits
224311c
dc01932
f6167fe
dd9bb9e
2f77ce6
11470e1
d1edd16
47b676c
54da09f
071fa1a
19af31d
fece58f
80396ba
88a9aac
d7b551d
00e554f
7cbdd37
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -99,6 +99,7 @@ jobs: | |
- build_focal_64 | ||
- build_mac | ||
- build_mingw | ||
- build_snap | ||
- build_source | ||
- build_stretch_64 | ||
steps: | ||
|
@@ -740,6 +741,24 @@ jobs: | |
with: | ||
name: release_focal_64 | ||
path: bin/clementine_*.deb | ||
|
||
build_snap: | ||
name: Build Snap | ||
runs-on: ubuntu-18.04 | ||
steps: | ||
- uses: actions/[email protected] | ||
- uses: snapcore/action-build@v1 | ||
id: snapcraft | ||
- uses: snapcore/action-publish@v1 | ||
if: github.ref == 'refs/heads/master' | ||
with: | ||
store_login: ${{ secrets.SNAP_STORE_LOGIN }} | ||
snap: ${{ steps.snapcraft.outputs.snap }} | ||
release: edge | ||
- uses: actions/upload-artifact@v2 | ||
with: | ||
name: release_snap | ||
path: ${{ steps.snapcraft.outputs.snap }} | ||
|
||
build_mac: | ||
name: Build Mac DMG | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
name: clementine | ||
version: '1.3.1.31+git' | ||
#version: 'latest' | ||
adopt-info: clementine | ||
summary: modern music player | ||
description: | | ||
Clementine is a modern music player and library organizer | ||
|
@@ -8,6 +9,11 @@ grade: stable | |
confinement: strict | ||
base: core18 | ||
|
||
architectures: | ||
- build-on: amd64 | ||
- build-on: i386 | ||
- build-on: arm64 | ||
|
||
parts: | ||
|
||
desktop-qt5: | ||
|
@@ -68,12 +74,18 @@ parts: | |
after: | ||
- alsa-lib | ||
- desktop-qt5 | ||
|
||
override-pull: | | ||
snapcraftctl pull | ||
snapcraftctl set-version "$(git describe --tags | sed 's/^v//' | cut -d "-" -f1-2)" | ||
|
||
override-build: | | ||
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr | ||
make -j $(getconf _NPROCESSORS_ONLN) | ||
make DESTDIR=$SNAPCRAFT_PART_INSTALL install | ||
sed -i 's|Icon=clementine|Icon=/usr/share/icons/hicolor/scalable/apps/clementine\.svg|' $SNAPCRAFT_PART_INSTALL/usr/share/applications/clementine.desktop | ||
sed -i 's|TryExec=.*|TryExec=/snap/bin/clementine|' $SNAPCRAFT_PART_INSTALL/usr/share/applications/clementine.desktop | ||
# add-apt-repository ppa:rock-core/qt4 # may need this | ||
|
||
build-packages: | ||
- cmake | ||
|
@@ -110,6 +122,7 @@ parts: | |
- libglew-dev | ||
- libcrypto++-dev | ||
- libsparsehash-dev | ||
# - libqt5-sqlite | ||
|
||
stage-packages: | ||
- libstdc++6 | ||
|
@@ -166,14 +179,35 @@ parts: | |
- gstreamer1.0-libav | ||
- dbus-x11 | ||
- projectm-data | ||
- qtwayland5 # Attempt at Wayland Support | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do these attempts work? If not, let's remove them. I very much doubt the Spotify one works but I don't know much about Wayland. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Latest version released shows logs that it's looking for a " There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The Wayland attempt definitely works (I'll remove the comment) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @kz6fittycent The libspotify.so is there, but there are broken symlinks. I have documented my findings in kz6fittycent/clementine#10 |
||
- libqtcore4 # Attempt to get Spotify to work | ||
- glibc-source # Attempt to get Spotify to work | ||
- plasma-integration | ||
- kde-style-breeze | ||
- qt5-gtk-platformtheme | ||
|
||
plugs: | ||
gtk-3-themes: | ||
interface: content | ||
target: $SNAP/data-dir/themes | ||
default-provider: gtk-common-themes | ||
icon-themes: | ||
interface: content | ||
target: $SNAP/data-dir/icons | ||
default-provider: gtk-common-themes | ||
sound-themes: | ||
interface: content | ||
target: $SNAP/data-dir/sounds | ||
default-provider: gtk-common-themes | ||
|
||
apps: | ||
clementine: | ||
command: desktop-launch $SNAP/usr/bin/clementine | ||
command: bin/desktop-launch $SNAP/usr/bin/clementine | ||
desktop: usr/share/applications/clementine.desktop | ||
environment: | ||
ALSA_CONFIG_PATH: /snap/$SNAPCRAFT_PROJECT_NAME/current/usr/share/alsa/alsa.conf | ||
LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio | ||
DISABLE_WAYLAND: 1 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This seems counter to the attempt at wayland support above. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Needs to stay. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this is needed for clementine to run as an XWayland app when in a wayland session. Without this environment variable, clementine looks like this in Wayland: |
||
plugs: | ||
- home | ||
- udisks2 | ||
|
@@ -196,8 +230,8 @@ apps: | |
- mpris | ||
|
||
clementine-tagreader: | ||
command: clementine-tagreader | ||
command: usr/bin/clementine-tagreader | ||
plugs: | ||
- network | ||
- network-manager-observe | ||
- network-bind | ||
- network-bind |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we remove these commented out bits?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's removed now.