From fea0c427dd13041c1d86a94d5fecbfe348f5bb94 Mon Sep 17 00:00:00 2001 From: Andrey Onishchenko Date: Sun, 18 Feb 2024 18:56:22 +0300 Subject: [PATCH 1/4] Use electron 27 version for arch (fix render issues) Dep fix --- .github/workflows/build.sh | 2 +- PKGBUILD | 4 ++-- templates/PKGBUILD | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh index 4064f77..9a8b9ba 100755 --- a/.github/workflows/build.sh +++ b/.github/workflows/build.sh @@ -16,7 +16,7 @@ case $OS in "Arch Linux") echo "Arch Linux" pacman -Syy --noconfirm - pacman -S --noconfirm git sudo base-devel p7zip nodejs jq asar electron libpulse dpkg unzip xdg-utils python + pacman -S --noconfirm git sudo base-devel p7zip nodejs jq asar electron27 libpulse dpkg unzip xdg-utils python # fix makepkg from non-root mkdir /home/build chgrp nobody /home/build diff --git a/PKGBUILD b/PKGBUILD index c429bf0..70fd416 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgdesc="Yandex Music - Personal recommendations, selections for any occasion an arch=("any") url="https://github.com/cucumber-sp/yandex-music-linux" license=("custom") -depends=("electron" "libpulse" "xdg-utils") +depends=("electron27" "libpulse" "xdg-utils") makedepends=("p7zip" "nodejs" "asar" "jq" "python") source=("https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.0.11.exe" "git+https://github.com/cucumber-sp/yandex-music-linux") @@ -29,6 +29,6 @@ package() { # Create a script to launch the app with Electron echo "#!/bin/sh" > "$pkgdir/usr/bin/yandex-music" - echo 'exec electron /usr/lib/yandex-music/yandex-music.asar "$@"' >> "$pkgdir/usr/bin/yandex-music" + echo 'exec electron27 /usr/lib/yandex-music/yandex-music.asar "$@"' >> "$pkgdir/usr/bin/yandex-music" chmod 755 "$pkgdir/usr/bin/yandex-music" } diff --git a/templates/PKGBUILD b/templates/PKGBUILD index 7f0f63e..9fc5004 100644 --- a/templates/PKGBUILD +++ b/templates/PKGBUILD @@ -7,7 +7,7 @@ pkgdesc="Yandex Music - Personal recommendations, selections for any occasion an arch=("any") url="https://github.com/cucumber-sp/yandex-music-linux" license=("custom") -depends=("electron" "libpulse" "xdg-utils") +depends=("electron27" "libpulse" "xdg-utils") makedepends=("p7zip" "nodejs" "asar" "jq" "python") source=("%exe_link%" "git+https://github.com/cucumber-sp/yandex-music-linux") @@ -29,6 +29,6 @@ package() { # Create a script to launch the app with Electron echo "#!/bin/sh" > "$pkgdir/usr/bin/yandex-music" - echo 'exec electron /usr/lib/yandex-music/yandex-music.asar "$@"' >> "$pkgdir/usr/bin/yandex-music" + echo 'exec electron27 /usr/lib/yandex-music/yandex-music.asar "$@"' >> "$pkgdir/usr/bin/yandex-music" chmod 755 "$pkgdir/usr/bin/yandex-music" } From 179d762d52abdb2438bab1afa992381622e96abd Mon Sep 17 00:00:00 2001 From: Andrey Onishchenko Date: Sun, 18 Feb 2024 19:01:54 +0300 Subject: [PATCH 2/4] Fix AUR commits naming --- .github/workflows/update-build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-build-release.yml b/.github/workflows/update-build-release.yml index 0b68baa..f3a846d 100644 --- a/.github/workflows/update-build-release.yml +++ b/.github/workflows/update-build-release.yml @@ -48,7 +48,7 @@ jobs: commit_username: "cucumber-sp" commit_email: "loraner123@gmail.com" ssh_private_key: "${{ secrets.AUR_SSH_PRIVATE_KEY }}" - commit_message: $(git log -1 --pretty=format:"%s") + commit_message: "${{ github.event.commits[0].message }}" ssh_keyscan_types: "rsa,dsa,ecdsa,ed25519" outputs: new_version: ${{ steps.commit.outputs.commited }} From 3c96f5f7948d1dcf23e34dcf8efae99df1307d23 Mon Sep 17 00:00:00 2001 From: Andrey Onishchenko Date: Sun, 18 Feb 2024 19:03:14 +0300 Subject: [PATCH 3/4] Allow empty commits for AUR --- .github/workflows/update-build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-build-release.yml b/.github/workflows/update-build-release.yml index f3a846d..39d24c7 100644 --- a/.github/workflows/update-build-release.yml +++ b/.github/workflows/update-build-release.yml @@ -44,7 +44,7 @@ jobs: pkgname: "yandex-music" pkgbuild: "PKGBUILD" updpkgsums: false - allow_empty_commits: false + allow_empty_commits: true commit_username: "cucumber-sp" commit_email: "loraner123@gmail.com" ssh_private_key: "${{ secrets.AUR_SSH_PRIVATE_KEY }}" From d3444b2e943f222a58cd0cb8179b7d155a38e596 Mon Sep 17 00:00:00 2001 From: Andrey Onishchenko Date: Sun, 18 Feb 2024 19:10:28 +0300 Subject: [PATCH 4/4] Update electron version for debian --- build_deb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_deb.sh b/build_deb.sh index daa5650..9219470 100755 --- a/build_deb.sh +++ b/build_deb.sh @@ -13,7 +13,7 @@ usage() { download_electron_binary(){ arch=${1} echo "Downloading electron ${arch}" - curl -L -o "${TEMPDIR}/electron-${arch}.zip" "https://github.com/electron/electron/releases/download/v27.3.0/electron-v27.3.0-linux-${arch}.zip" + curl -L -o "${TEMPDIR}/electron-${arch}.zip" "https://github.com/electron/electron/releases/download/v27.3.2/electron-v27.3.2-linux-${arch}.zip" unzip -q "${TEMPDIR}/electron-${arch}.zip" -d "${TEMPDIR}/electron-${arch}" }