From 2d09ea18a77f5d1473170c514ba54b8cbd995135 Mon Sep 17 00:00:00 2001 From: damnkrat <32395839+damnkrat@users.noreply.github.com> Date: Fri, 12 Jul 2024 23:09:55 +0300 Subject: [PATCH 1/4] Support building for arch linux --- electron-builder.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/electron-builder.yml b/electron-builder.yml index be300d365..6175ae633 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -46,6 +46,7 @@ linux: - snap - deb - rpm + - pacman maintainer: electronjs.org category: Game mimeTypes: From d8e4eef1070b392d1be707bc52cc670f476a2ac6 Mon Sep 17 00:00:00 2001 From: dannkunt Date: Sun, 14 Jul 2024 04:03:35 +0300 Subject: [PATCH 2/4] Fix build workflows --- .github/workflows/build.yml | 6 ++++++ .github/workflows/release.yml | 1 + electron-builder.yml | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20a00ccfb..89bb555bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,6 +33,11 @@ jobs: - name: Build with cx_Freeze run: python torrent-client/setup.py build + - name: Install bsdtar + run: | + sudo apt-get update + sudo apt-get install -y libarchive-tools + - name: Build Linux if: matrix.os == 'ubuntu-latest' run: yarn build:linux @@ -69,3 +74,4 @@ jobs: dist/*.tar.gz dist/*.yml dist/*.blockmap + dist/*.pacman diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a0684c6c6..9da34c723 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -72,5 +72,6 @@ jobs: dist/*.tar.gz dist/*.yml dist/*.blockmap + dist/*.pacman env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/electron-builder.yml b/electron-builder.yml index 6175ae633..3ed416fab 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -1,4 +1,4 @@ -appId: site.hydralauncher.hydra +appId: site. hydralauncher.hydra productName: Hydra directories: buildResources: build @@ -45,8 +45,8 @@ linux: - AppImage - snap - deb - - rpm - pacman + - rpm maintainer: electronjs.org category: Game mimeTypes: From b5af73cec42c45210d06b108cd53ae8c988c8bb4 Mon Sep 17 00:00:00 2001 From: dannkunt Date: Sun, 14 Jul 2024 14:11:35 +0300 Subject: [PATCH 3/4] Do not install bsdtar on windows --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 89bb555bb..eeeb2e9e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,6 +34,7 @@ jobs: run: python torrent-client/setup.py build - name: Install bsdtar + if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update sudo apt-get install -y libarchive-tools From 1366ca0087eb481a56e15d20d4866d771398d3fa Mon Sep 17 00:00:00 2001 From: dannkunt Date: Tue, 16 Jul 2024 16:38:06 +0300 Subject: [PATCH 4/4] Also build arch at release --- .github/workflows/build.yml | 7 ++----- .github/workflows/release.yml | 5 ++++- electron-builder.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eeeb2e9e2..83636af60 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,15 +33,12 @@ jobs: - name: Build with cx_Freeze run: python torrent-client/setup.py build - - name: Install bsdtar + - name: Build Linux if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update sudo apt-get install -y libarchive-tools - - - name: Build Linux - if: matrix.os == 'ubuntu-latest' - run: yarn build:linux + yarn build:linux env: MAIN_VITE_ONLINEFIX_USERNAME: ${{ secrets.ONLINEFIX_USERNAME }} MAIN_VITE_ONLINEFIX_PASSWORD: ${{ secrets.ONLINEFIX_PASSWORD }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9da34c723..0a5296f03 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,10 @@ jobs: - name: Build Linux if: matrix.os == 'ubuntu-latest' - run: yarn build:linux + run: | + sudo apt-get update + sudo apt-get install -y libarchive-tools + yarn build:linux env: MAIN_VITE_ONLINEFIX_USERNAME: ${{ secrets.ONLINEFIX_USERNAME }} MAIN_VITE_ONLINEFIX_PASSWORD: ${{ secrets.ONLINEFIX_PASSWORD }} diff --git a/electron-builder.yml b/electron-builder.yml index 3ed416fab..65c847a2b 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -1,4 +1,4 @@ -appId: site. hydralauncher.hydra +appId: site.hydralauncher.hydra productName: Hydra directories: buildResources: build