Merge branch 'master' into without-flatpak

.github/workflows/build-artifacts.yml

@@ -4,7 +4,6 @@ on:
   push:
     tags:
       - '*'
-  workflow_dispatch:
 
 jobs:
   packages:
@@ -19,22 +18,30 @@ jobs:
   
     - name: install_deps
       run: make install_deps
-    - name: build_deb
+
-      run: make build_deb
+    - name: build_deb_x64
-    - name: build_rpm
+      run: make build_deb_x64
-      run: make build_rpm
+    - name: build_rpm_x64
-    - name: build_snap
+      run: make build_rpm_x64
-      run: make build_snap
+    - name: build_appimage_x64
-    - name: build_appimage
+      run: make build_appimage_x64
-      run: make build_appimage
+    - name: build_tar.xz_x64
-    - name: build_tar.xz
+      run: make build_tar.xz_x64
-      run: make build_tar.xz
+
-    
+    - name: build_deb_arm64
+      run: make build_deb_arm64
+    - name: build_rpm_arm64
+      run: make build_rpm_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 artifacts/{x64,arm64}/*.{deb,rpm,AppImage,tar.xz})" > sha256
 
     - name: create release
       uses: softprops/action-gh-release@v1
@@ -43,10 +50,12 @@ 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/*.AppImage
+            artifacts/arm64/*.tar.xz
             sha256

.github/workflows/build.yml

@@ -13,13 +13,19 @@ jobs:
     - uses: actions/setup-node@v2
       with:
         node-version: 18
-  
+
     - name: install_deps
       run: make install_deps
-    - name: build_appimage
+    - name: build_appimage_x64
-      run: make build_appimage
+      run: make build_appimage_x64
+    - name: build_appimage_arm64
+      run: make build_appimage_arm64
 
     - 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

Makefile

@@ -1,14 +1,14 @@
 # Maintainer: Aurélien Hamy <aunetx@yandex.com>
 
 APPNAME = dev.aunetx.deezer
-PKGVER = 5.30.570
+PKGVER = 5.30.590
 BASE_URL = https://www.deezer.com/desktop/download/artifact/win32/x86/$(PKGVER)
 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
@@ -47,28 +47,39 @@ install_deps: prepare
 	@echo "Install yarn dependencies to pack them later"
 	@yarn --cwd=app install
 
-# the following should be run after `install_deps`
-# (it is not a dependency to allow to build multiple packages)
 
-build_deb:
+build_tar.xz_x64:
-	@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_tar.xz:
 	@echo "Build tar.xz archive"
-	@yarn --cwd=app run build-tar.xz
+	@yarn --cwd=app run build-tar.xz-x64
+
+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_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_appimage_arm64:
+	@echo "Build AppImage binary"
+	@yarn --cwd=app run build-appimage-arm64
 
 
 #! UTILS

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)
 
@@ -7,7 +17,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 +26,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 +46,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
 

package-append.json

@@ -3,26 +3,16 @@
     "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-tar.xz-x64": "electron-builder --x64 --linux tar.xz",
-    "build-deb": "electron-builder --x64 --linux deb",
+    "build-deb-x64": "electron-builder --x64 --linux deb",
-    "build-rpm": "electron-builder --x64 --linux rpm",
+    "build-rpm-x64": "electron-builder --x64 --linux rpm",
-    "build-snap": "electron-builder --x64 --linux snap",
+    "build-snap-x64": "electron-builder --x64 --linux snap",
-    "build-appimage": "electron-builder --x64 --linux AppImage",
+    "build-appimage-x64": "electron-builder --x64 --linux AppImage",
-    "build-7z": "electron-builder --x64 --linux 7z",
-    "build-tar.xz": "electron-builder --x64 --linux tar.xz",
 
-    "build-arm": "electron-builder --arm64 --linux deb rpm snap AppImage 7z tar.gz zip",
+    "build-tar.xz-arm64": "electron-builder --arm64 --linux tar.xz",
-    "build-deb-arm": "electron-builder --arm64 --linux deb",
+    "build-deb-arm64": "electron-builder --arm64 --linux deb",
-    "build-rpm-arm": "electron-builder --arm64 --linux rpm",
+    "build-rpm-arm64": "electron-builder --arm64 --linux rpm",
-    "build-snap-arm": "electron-builder --arm64 --linux snap",
+    "build-appimage-arm64": "electron-builder --arm64 --linux AppImage"
-    "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"
   },
   "devDependencies": {
     "electron": "^13.6.9",