From 786d1d7e4287d304db51f2c96e1d47ecf269df11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Hamy?= Date: Thu, 29 Jun 2023 16:31:03 +0200 Subject: [PATCH 01/10] Update README.md --- README.md | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 9771231..774f5a7 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This repo is an UNOFFICIAL linux port of the official windows-only Deezer app. B It packages the app in a number of formats: -- Flatpak +- Flatpak, [available on flathub](https://flathub.org/apps/dev.aunetx.deezer) - Snap (not tested yet) - AppImage (can't automatically login without desktop integration) - `rpm` (Fedora, Red Hat, CentOS, openSUSE, ...) @@ -16,12 +16,11 @@ It packages the app in a number of formats: It was done thanks to the hard work of [SibrenVasse](https://github.com/SibrenVasse), who [packaged the app for the AUR](https://github.com/SibrenVasse/deezer). - ## Installation You can find all of the packages on [the release page](https://github.com/aunetx/deezer-linux/releases/latest). -[The flatpak file,`deezer.flatpakref`](https://github.com/aunetx/deezer-linux/releases/download/v5.30.100-1/deezer.flatpakref), can be installed directly by clicking on it; your package manager's GUI should prompt you to install it. +To install the flatpak version, you can simply go to https://flathub.org/apps/dev.aunetx.deezer (or use your favorite flatpak package manager). For the moment, it is still possible to use this github repo as a flatpak repository BUT it will not be the case anymore very soon. **Existing users should migrate as soon as they can toward Flathub.** Other packages can be installed from you package manager, either by clicking on them or from the command-line. @@ -37,37 +36,6 @@ You will probably need to install some things in order to generate the packages - 7z by installing `p7zip` and `p7zip-full` - make - wget -- `flatpak-builder` (only to build the flatpak version) - -### Flatpak - -To build it and install it: - -```sh -make install_flatpak -``` - -And when it is installed, you can run it with `flatpak run dev.aunetx.deezer`, or from the desktop icon. - -To just build it, for testing purposes: - -```sh -make build_flatpak -``` - -To build it and install it in the local repo (which you can import later): - -```sh -make export_flatpak -``` - -To build it and create a bundle, which is then installable offline: - -```sh -make bundle_flatpak -``` - -Please not that in order to export the built flatpak image to your local repo or create a bundle, you will need to change `$(GPG_KEY_ID)` in the `Makefile` to use your gpg key. ### AppImage From 5410f9a3f59a510e0a7e652066f21e3ff31fc85b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Hamy?= Date: Thu, 29 Jun 2023 16:36:07 +0200 Subject: [PATCH 02/10] Update README.md --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 774f5a7..c3ebce5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,15 @@ # Deezer for linux +**NOTICE:** existing flatpak users NEED to migrate the the flathub repository as soon as possible, as I will delete the flatpak repository from here (it is more than 2Gb in size). In order to do so, simply: + +```sh +flatpak uninstall dev.aunetx.deezer +flatpak remote-delete deezer-linux +flatpak install flathub dev.aunetx.deezer +``` + +--- + [![Build](https://github.com/aunetx/deezer-linux/actions/workflows/build.yml/badge.svg)](https://github.com/aunetx/deezer-linux/actions/workflows/build.yml) [![GitHub release (latest by date)](https://img.shields.io/github/v/release/aunetx/deezer-linux)](https://github.com/aunetx/deezer-linux/releases/latest) From 020fa288051eff60a01bfd4bdfd501fedd26f9f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Hamy?= Date: Sat, 8 Jul 2023 17:24:25 +0200 Subject: [PATCH 03/10] Update to 5.30.580 and add arm packaging --- .github/workflows/build-artifacts.yml | 44 ++++++++++++------ .github/workflows/build.yml | 9 +++- Makefile | 64 +++++++++++++++++---------- package-append.json | 29 +++++------- 4 files changed, 87 insertions(+), 59 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index ed2e4ff..32b9e8a 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -19,22 +19,34 @@ jobs: - name: install_deps run: make install_deps - - name: build_deb - run: make build_deb - - name: build_rpm - run: make build_rpm - - name: build_snap - run: make build_snap - - name: build_appimage - run: make build_appimage - - name: build_tar.xz - run: make build_tar.xz - + + - name: build_deb_x64 + run: make build_deb_x64 + - name: build_rpm_x64 + run: make build_rpm_x64 + - name: build_snap_x64 + run: make build_snap_x64 + - name: build_appimage_x64 + run: make build_appimage_x64 + - name: build_tar.xz_x64 + run: make build_tar.xz_x64 + + - name: build_deb_arm64 + run: make build_deb_arm64 + - name: build_rpm_arm64 + run: make build_rpm_arm64 + - name: build_snap_arm64 + run: make build_snap_arm64 + - name: build_appimage_arm64 + run: make build_appimage_arm64 + - name: build_tar.xz_arm64 + run: make build_tar.xz_arm64 + - name: Get the version run: echo "version=${GITHUB_REF/refs\/tags\//}" >> "$GITHUB_ENV" - + - name: Generate sha256 - run: echo "$(sha256sum {deezer.flatpakref,artifacts/x64/*.{deb,rpm,snap,AppImage,tar.xz}})" > sha256 + run: echo "$(sha256sum {deezer.flatpakref,artifacts/{x64,amd64}/*.{deb,rpm,snap,AppImage,tar.xz}})" > sha256 - name: create release uses: softprops/action-gh-release@v1 @@ -43,10 +55,14 @@ jobs: body: 'Update to version ${{ env.version }}' draft: false files: | - deezer.flatpakref artifacts/x64/*.deb artifacts/x64/*.rpm artifacts/x64/*.snap artifacts/x64/*.AppImage artifacts/x64/*.tar.xz + artifacts/arm64/*.deb + artifacts/arm64/*.rpm + artifacts/arm64/*.snap + artifacts/arm64/*.AppImage + artifacts/arm64/*.tar.xz sha256 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2cef0e4..7d5cff7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/setup-node@v2 with: node-version: 18 - + - name: install_deps run: make install_deps - name: build_appimage @@ -21,5 +21,10 @@ jobs: - uses: actions/upload-artifact@v2 with: - name: deezer-desktop-nightly-build.AppImage + name: deezer-desktop-nightly-build-x64.AppImage path: artifacts/x64/deezer-desktop-*.AppImage + + - uses: actions/upload-artifact@v2 + with: + name: deezer-desktop-nightly-build-arm64.AppImage + path: artifacts/arm64/deezer-desktop-*.AppImage diff --git a/Makefile b/Makefile index e7ccfc3..9802674 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Maintainer: Aurélien Hamy APPNAME = dev.aunetx.deezer -PKGVER = 5.30.570 +PKGVER = 5.30.580 BASE_URL = https://www.deezer.com/desktop/download/artifact/win32/x86/$(PKGVER) GPG_KEY_ID = 5A7D3B06F15FB60238941027EB3A799E7EE716EB VERSION_REGEX = ^v$(PKGVER)-[0-9]{1,}$$ @@ -9,7 +9,7 @@ VERSION_REGEX = ^v$(PKGVER)-[0-9]{1,}$$ install_build_deps: @npm install --engine-strict asar - @npm install prettier + @npm install prettier@2.8.8 prepare: clean install_build_deps @mkdir -p source @@ -76,31 +76,47 @@ install_deps: prepare @echo "Install yarn dependencies to pack them later" @yarn --cwd=app install -build_deb: - @echo "Build deb package" - @yarn --cwd=app run build-deb -build_rpm: - @echo "Build rpm package" - @yarn --cwd=app run build-rpm - -build_snap: - @echo "Build snap package" - @yarn --cwd=app run build-snap - -build_appimage: - @echo "Build AppImage binary" - @yarn --cwd=app run build-appimage - -build_7z: - @echo "Build 7z archive" - @yarn --cwd=app run build-7z - -build_tar.xz: +build_tar.xz_x64: @echo "Build tar.xz archive" - @yarn --cwd=app run build-tar.xz + @yarn --cwd=app run build-tar.xz-x64 -build_pkgs: install_deps build_deb build_rpm build_snap build_appimage build_7z build_tar.xz +build_deb_x64: + @echo "Build deb package" + @yarn --cwd=app run build-deb-x64 + +build_rpm_x64: + @echo "Build rpm package" + @yarn --cwd=app run build-rpm-x64 + +build_snap_x64: + @echo "Build snap package" + @yarn --cwd=app run build-snap-x64 + +build_appimage_x64: + @echo "Build AppImage binary" + @yarn --cwd=app run build-appimage-x64 + + +build_tar.xz_arm64: + @echo "Build tar.xz archive" + @yarn --cwd=app run build-tar.xz-arm64 + +build_deb_arm64: + @echo "Build deb package" + @yarn --cwd=app run build-deb-arm64 + +build_rpm_arm64: + @echo "Build rpm package" + @yarn --cwd=app run build-rpm-arm64 + +build_snap_arm64: + @echo "Build snap package" + @yarn --cwd=app run build-snap-arm64 + +build_appimage_arm64: + @echo "Build AppImage binary" + @yarn --cwd=app run build-appimage-arm64 #! UTILS diff --git a/package-append.json b/package-append.json index 5991745..225d18c 100644 --- a/package-append.json +++ b/package-append.json @@ -3,26 +3,17 @@ "start": "yarn run copy-resources && electron .", "prepare-flatpak": "electron-builder --linux --dir", - "build": "electron-builder --x64 --linux deb rpm snap AppImage 7z tar.gz zip", - "build-deb": "electron-builder --x64 --linux deb", - "build-rpm": "electron-builder --x64 --linux rpm", - "build-snap": "electron-builder --x64 --linux snap", - "build-appimage": "electron-builder --x64 --linux AppImage", - "build-7z": "electron-builder --x64 --linux 7z", - "build-tar.xz": "electron-builder --x64 --linux tar.xz", + "build-tar.xz-x64": "electron-builder --x64 --linux tar.xz", + "build-deb-x64": "electron-builder --x64 --linux deb", + "build-rpm-x64": "electron-builder --x64 --linux rpm", + "build-snap-x64": "electron-builder --x64 --linux snap", + "build-appimage-x64": "electron-builder --x64 --linux AppImage", - "build-arm": "electron-builder --arm64 --linux deb rpm snap AppImage 7z tar.gz zip", - "build-deb-arm": "electron-builder --arm64 --linux deb", - "build-rpm-arm": "electron-builder --arm64 --linux rpm", - "build-snap-arm": "electron-builder --arm64 --linux snap", - "build-appimage-arm": "electron-builder --arm64 --linux AppImage", - "build-7z-arm": "electron-builder --arm64 --linux 7z", - "build-tar.xz-arm": "electron-builder --arm64 --linux tar.xz", - - "build-x86": "electron-builder --ia32 --linux deb", - "build-deb-x86": "electron-builder --ia32 --linux deb", - "build-7z-x86": "electron-builder --ia32 --linux 7z", - "build-tar.xz-x86": "electron-builder --ia32 --linux tar.xz" + "build-tar.xz-arm64": "electron-builder --arm64 --linux tar.xz", + "build-deb-arm64": "electron-builder --arm64 --linux deb", + "build-rpm-arm64": "electron-builder --arm64 --linux rpm", + "build-snap-arm64": "electron-builder --arm64 --linux snap", + "build-appimage-arm64": "electron-builder --arm64 --linux AppImage" }, "devDependencies": { "electron": "^13.6.9", From 004139eacc2ad9482b25df89a6e6c1cd8dda9632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Hamy?= Date: Sat, 8 Jul 2023 17:26:09 +0200 Subject: [PATCH 04/10] Correct CI --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d5cff7..a5208a0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,8 +16,10 @@ jobs: - name: install_deps run: make install_deps - - name: build_appimage - run: make build_appimage + - name: build_appimage_x64 + run: make build_appimage_x64 + - name: build_appimage_amd64 + run: make build_appimage_amd64 - uses: actions/upload-artifact@v2 with: From 23a846e1508c4f2e95d89ceb5b3aa745c02ea629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Hamy?= Date: Sat, 8 Jul 2023 17:28:17 +0200 Subject: [PATCH 05/10] Correct again --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5208a0..7627a5e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,14 +18,13 @@ jobs: run: make install_deps - name: build_appimage_x64 run: make build_appimage_x64 - - name: build_appimage_amd64 - run: make build_appimage_amd64 + - name: build_appimage_arm64 + run: make build_appimage_arm64 - uses: actions/upload-artifact@v2 with: name: deezer-desktop-nightly-build-x64.AppImage path: artifacts/x64/deezer-desktop-*.AppImage - - uses: actions/upload-artifact@v2 with: name: deezer-desktop-nightly-build-arm64.AppImage From 31d6d3f2b0c201a9e269cd3a84b79f29790781d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Hamy?= Date: Sat, 8 Jul 2023 17:32:55 +0200 Subject: [PATCH 06/10] Remove workflow dispatch (does not work) --- .github/workflows/build-artifacts.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 32b9e8a..9b9d9de 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -4,7 +4,6 @@ on: push: tags: - '*' - workflow_dispatch: jobs: packages: From 0696cb5910fe72188e5479efb0abfa302552a2ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Hamy?= Date: Sat, 8 Jul 2023 17:45:34 +0200 Subject: [PATCH 07/10] Can't build arm64 snap --- Makefile | 4 ---- package-append.json | 1 - 2 files changed, 5 deletions(-) diff --git a/Makefile b/Makefile index 9802674..bd3af2c 100644 --- a/Makefile +++ b/Makefile @@ -110,10 +110,6 @@ build_rpm_arm64: @echo "Build rpm package" @yarn --cwd=app run build-rpm-arm64 -build_snap_arm64: - @echo "Build snap package" - @yarn --cwd=app run build-snap-arm64 - build_appimage_arm64: @echo "Build AppImage binary" @yarn --cwd=app run build-appimage-arm64 diff --git a/package-append.json b/package-append.json index 225d18c..6bdbeca 100644 --- a/package-append.json +++ b/package-append.json @@ -12,7 +12,6 @@ "build-tar.xz-arm64": "electron-builder --arm64 --linux tar.xz", "build-deb-arm64": "electron-builder --arm64 --linux deb", "build-rpm-arm64": "electron-builder --arm64 --linux rpm", - "build-snap-arm64": "electron-builder --arm64 --linux snap", "build-appimage-arm64": "electron-builder --arm64 --linux AppImage" }, "devDependencies": { From c5351e55302013320247f06fd7e63f6320424610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Hamy?= Date: Sat, 8 Jul 2023 17:58:43 +0200 Subject: [PATCH 08/10] Remove snap entirely I don't even know if it works... --- .github/workflows/build-artifacts.yml | 8 +------- Makefile | 4 ---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 9b9d9de..5fc7e10 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -23,8 +23,6 @@ jobs: run: make build_deb_x64 - name: build_rpm_x64 run: make build_rpm_x64 - - name: build_snap_x64 - run: make build_snap_x64 - name: build_appimage_x64 run: make build_appimage_x64 - name: build_tar.xz_x64 @@ -34,8 +32,6 @@ jobs: run: make build_deb_arm64 - name: build_rpm_arm64 run: make build_rpm_arm64 - - name: build_snap_arm64 - run: make build_snap_arm64 - name: build_appimage_arm64 run: make build_appimage_arm64 - name: build_tar.xz_arm64 @@ -45,7 +41,7 @@ jobs: run: echo "version=${GITHUB_REF/refs\/tags\//}" >> "$GITHUB_ENV" - name: Generate sha256 - run: echo "$(sha256sum {deezer.flatpakref,artifacts/{x64,amd64}/*.{deb,rpm,snap,AppImage,tar.xz}})" > sha256 + run: echo "$(sha256sum {deezer.flatpakref,artifacts/{x64,amd64}/*.{deb,rpm,AppImage,tar.xz}})" > sha256 - name: create release uses: softprops/action-gh-release@v1 @@ -56,12 +52,10 @@ jobs: files: | artifacts/x64/*.deb artifacts/x64/*.rpm - artifacts/x64/*.snap artifacts/x64/*.AppImage artifacts/x64/*.tar.xz artifacts/arm64/*.deb artifacts/arm64/*.rpm - artifacts/arm64/*.snap artifacts/arm64/*.AppImage artifacts/arm64/*.tar.xz sha256 diff --git a/Makefile b/Makefile index bd3af2c..cadeba1 100644 --- a/Makefile +++ b/Makefile @@ -89,10 +89,6 @@ build_rpm_x64: @echo "Build rpm package" @yarn --cwd=app run build-rpm-x64 -build_snap_x64: - @echo "Build snap package" - @yarn --cwd=app run build-snap-x64 - build_appimage_x64: @echo "Build AppImage binary" @yarn --cwd=app run build-appimage-x64 From 4198abbce38ebb94924a497485e9a1ede51932e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Hamy?= Date: Sat, 8 Jul 2023 18:36:24 +0200 Subject: [PATCH 09/10] Correct CI --- .github/workflows/build-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 5fc7e10..068c7d2 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -41,7 +41,7 @@ jobs: run: echo "version=${GITHUB_REF/refs\/tags\//}" >> "$GITHUB_ENV" - name: Generate sha256 - run: echo "$(sha256sum {deezer.flatpakref,artifacts/{x64,amd64}/*.{deb,rpm,AppImage,tar.xz}})" > sha256 + run: echo "$(sha256sum artifacts/{x64,arm64}/*.{deb,rpm,AppImage,tar.xz})" > sha256 - name: create release uses: softprops/action-gh-release@v1 From df7cffcd38f8493a36f87ac5e265e61b6e4de84c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Hamy?= Date: Thu, 3 Aug 2023 12:23:08 +0200 Subject: [PATCH 10/10] Update to 5.30.590 --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index cadeba1..1eea687 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Maintainer: Aurélien Hamy APPNAME = dev.aunetx.deezer -PKGVER = 5.30.580 +PKGVER = 5.30.590 BASE_URL = https://www.deezer.com/desktop/download/artifact/win32/x86/$(PKGVER) GPG_KEY_ID = 5A7D3B06F15FB60238941027EB3A799E7EE716EB VERSION_REGEX = ^v$(PKGVER)-[0-9]{1,}$$ @@ -117,9 +117,6 @@ prepare-release: @echo $(DEEZER_RELEASE) | egrep "$(VERSION_REGEX)" > /dev/null || \ (echo "$(DEEZER_RELEASE) is not a correct release version of v$(PKGVER)" && false) - @cat $(APPNAME).appdata.xml | egrep "$(PKGVER)" > /dev/null || \ - (echo "$(APPNAME).appdata.xml should contain version $(DEEZER_RELEASE)" && false) - @desktop-file-validate $(APPNAME).desktop || \ (echo "Desktop file validation failed" && false)