From fd604cb2743ade30065cae0fce771003aa998bd0 Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 27 Oct 2023 14:43:20 +0800 Subject: [PATCH 01/37] feat: build .AppImage asset --- .github/release-drafter.yml | 6 +++- .github/workflows/build.yml | 70 +++++++++++++++++++++++++++++++++++-- 2 files changed, 72 insertions(+), 4 deletions(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 0dbd0643c..ec071458e 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -32,6 +32,10 @@ version-resolver: - 'patch' default: patch template: | - ## Changes + # Changes + + $CHANGES + + # 更新日志 $CHANGES \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a10e7a9c6..0038b21ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -217,13 +217,16 @@ jobs: go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop cd ui/flutter flutter build linux + mkdir -p build/dist + + # Build deb package mkdir -p debian/gui cp assets/icon/icon_1024.png debian/gui/gopeed.png cat>debian/debian.yaml<AppImageBuilder.yml< Date: Fri, 27 Oct 2023 15:39:51 +0800 Subject: [PATCH 02/37] feat: build linux portable asset --- .github/workflows/build.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0038b21ee..0caf5fa8a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,11 @@ name: build on: workflow_dispatch: + inputs: + platform: + description: 'Build platform' + required: true + default: 'all' env: GO_VERSION: "1.19" @@ -24,6 +29,7 @@ jobs: myToken: ${{ github.token }} build-windows: + if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'windows' }} runs-on: windows-latest needs: [ get-release ] steps: @@ -124,6 +130,7 @@ jobs: asset_path: ui/flutter/build/windows/Output/* overwrite: true build-macos-arm64-lib: + if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }} runs-on: ubuntu-latest needs: [ get-release ] steps: @@ -134,13 +141,14 @@ jobs: - name: Build run: | go install src.techknowlogick.com/xgo@latest - xgo -go go-1.19.x --targets=darwin/arm64 -tags="nosqlite" -ldflags="-w -s" -buildmode=c-shared -pkg=bind/desktop -out=libgopeed . + xgo -go go-$GO_VERSION.x --targets=darwin/arm64 -tags="nosqlite" -ldflags="-w -s" -buildmode=c-shared -pkg=bind/desktop -out=libgopeed . mv libgopeed-*.dylib libgopeed.dylib - uses: actions/upload-artifact@v3 with: name: macos-arm64-lib path: libgopeed.dylib build-macos: + if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'macos' }} runs-on: macos-latest needs: [ get-release, build-macos-arm64-lib ] steps: @@ -197,6 +205,7 @@ jobs: asset_path: ui/flutter/build/macos/Build/Products/Release/dist/* overwrite: true build-linux: + if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'linux' }} runs-on: ubuntu-latest needs: [ get-release ] steps: @@ -219,6 +228,10 @@ jobs: flutter build linux mkdir -p build/dist + # Build portable + tar -czaf build/dist/Gopeed-$VERSION-linux-amd64-portable.tar.gz build/linux/x64/release/bundle + + # Build deb package mkdir -p debian/gui cp assets/icon/icon_1024.png debian/gui/gopeed.png @@ -321,6 +334,7 @@ jobs: asset_path: ui/flutter/build/dist/* overwrite: true build-android: + if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'android' }} runs-on: ubuntu-latest needs: [ get-release ] steps: @@ -358,6 +372,7 @@ jobs: asset_path: ui/flutter/dist/* overwrite: true build-ios: + if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'ios' }} runs-on: macos-latest needs: [ get-release ] steps: @@ -390,6 +405,7 @@ jobs: asset_path: ui/flutter/dist/* overwrite: true build-web: + if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'web' }} runs-on: ubuntu-latest needs: [ get-release ] steps: @@ -437,6 +453,7 @@ jobs: asset_path: dist/zip/* overwrite: true build-docker: + if: ${{ github.event.inputs.platform == 'all' || github.event.inputs.platform == 'docker' }} runs-on: ubuntu-latest needs: [ get-release ] steps: From a979c2ccd2a94124d7327cb1e04cd2b471c989b2 Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 27 Oct 2023 15:48:42 +0800 Subject: [PATCH 03/37] ci: test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0caf5fa8a..a7b77aa34 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: platform: description: 'Build platform' required: true - default: 'all' + default: 'linux' env: GO_VERSION: "1.19" From 90292d5d1500857ac75204bcc8aad1c79d074311 Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 27 Oct 2023 15:49:14 +0800 Subject: [PATCH 04/37] ci: test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a7b77aa34..0caf5fa8a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: platform: description: 'Build platform' required: true - default: 'linux' + default: 'all' env: GO_VERSION: "1.19" From b78e838af53447e22663c2e725344863acf96417 Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 27 Oct 2023 16:00:08 +0800 Subject: [PATCH 05/37] fix --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0caf5fa8a..0761621af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -269,6 +269,8 @@ jobs: # Build AppImage + wget -O appimage-builder https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage + chmod +x appimage-builder mkdir AppDir cp -r build/linux/x64/release/bundle/* AppDir mkdir -p AppDir/usr/share/icons From 3b9031e99b8553ccd7c767e69e35b736af24d586 Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 27 Oct 2023 16:09:59 +0800 Subject: [PATCH 06/37] fix: appimage-builder bin --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0761621af..e0a3f4059 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -327,7 +327,7 @@ jobs: arch: x86_64 update-information: guess EOF - appimage-builder --recipe AppImageBuilder.yml + ./appimage-builder --recipe AppImageBuilder.yml mv Gopeed-*-x86_64.AppImage build/dist/Gopeed-$VERSION-linux-amd64.AppImage - name: Upload uses: shogo82148/actions-upload-release-asset@v1 From 151eac75305cd01bdb261194254662ee5c7bd4ff Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 27 Oct 2023 16:16:42 +0800 Subject: [PATCH 07/37] fix: appimage-builder env --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e0a3f4059..013b05344 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -269,6 +269,7 @@ jobs: # Build AppImage + sudo apt-get -y install libfuse2 wget -O appimage-builder https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage chmod +x appimage-builder mkdir AppDir From e477cc3a057051752aa597c8f6bbe81b3e154c51 Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 27 Oct 2023 16:35:18 +0800 Subject: [PATCH 08/37] fix: appimage-builder skip-tests --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 013b05344..bce247824 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -328,7 +328,7 @@ jobs: arch: x86_64 update-information: guess EOF - ./appimage-builder --recipe AppImageBuilder.yml + ./appimage-builder --skip-tests --recipe AppImageBuilder.yml mv Gopeed-*-x86_64.AppImage build/dist/Gopeed-$VERSION-linux-amd64.AppImage - name: Upload uses: shogo82148/actions-upload-release-asset@v1 From 923b4b3a66bc1822a2a720e4fc162ff3c54748aa Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 27 Oct 2023 17:17:31 +0800 Subject: [PATCH 09/37] feat: test snap --- .github/workflows/build.yml | 59 +++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bce247824..649367776 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -330,6 +330,65 @@ jobs: EOF ./appimage-builder --skip-tests --recipe AppImageBuilder.yml mv Gopeed-*-x86_64.AppImage build/dist/Gopeed-$VERSION-linux-amd64.AppImage + + + # Build snap + sudo snap install snapcraft --classic + sudo snap install lxd + sudo lxd init --auto + mkdir -p snap/gui + cp assets/icon/icon_1024.png snap/gui/gopeed.png + cat>snap/snapcraft.yaml<snap/gui/gopeed.desktop< Date: Fri, 27 Oct 2023 17:17:57 +0800 Subject: [PATCH 10/37] feat: test snap --- .github/workflows/build.yml | 104 ------------------------------------ 1 file changed, 104 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 649367776..ce0da2735 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -228,110 +228,6 @@ jobs: flutter build linux mkdir -p build/dist - # Build portable - tar -czaf build/dist/Gopeed-$VERSION-linux-amd64-portable.tar.gz build/linux/x64/release/bundle - - - # Build deb package - mkdir -p debian/gui - cp assets/icon/icon_1024.png debian/gui/gopeed.png - cat>debian/debian.yaml<debian/gui/gopeed.desktop<AppImageBuilder.yml< Date: Fri, 27 Oct 2023 17:25:05 +0800 Subject: [PATCH 11/37] fix --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce0da2735..cff45b45e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -230,8 +230,8 @@ jobs: # Build snap sudo snap install snapcraft --classic - sudo snap install lxd - sudo lxd init --auto + # sudo snap install lxd + # sudo lxd init --auto mkdir -p snap/gui cp assets/icon/icon_1024.png snap/gui/gopeed.png cat>snap/snapcraft.yaml< Date: Fri, 27 Oct 2023 17:31:04 +0800 Subject: [PATCH 12/37] fix --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cff45b45e..e1fb8339e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -230,8 +230,8 @@ jobs: # Build snap sudo snap install snapcraft --classic - # sudo snap install lxd - # sudo lxd init --auto + sudo snap install lxd + sudo lxd init --auto mkdir -p snap/gui cp assets/icon/icon_1024.png snap/gui/gopeed.png cat>snap/snapcraft.yaml< Date: Fri, 27 Oct 2023 17:42:46 +0800 Subject: [PATCH 13/37] fix --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1fb8339e..f4ca597f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -227,7 +227,8 @@ jobs: cd ui/flutter flutter build linux mkdir -p build/dist - + - uses: whywaita/setup-lxd@v1 + run: | # Build snap sudo snap install snapcraft --classic sudo snap install lxd @@ -285,6 +286,7 @@ jobs: sudo snapcraft --use-lxd mv gopeed_*_amd64.snap build/dist/Gopeed-$VERSION-linux-amd64.snap + - name: Upload uses: shogo82148/actions-upload-release-asset@v1 with: From 0997545b2514f02dbdfa6e4b2c6019e294566704 Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 27 Oct 2023 17:43:49 +0800 Subject: [PATCH 14/37] fix --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f4ca597f6..869019ff9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -231,8 +231,6 @@ jobs: run: | # Build snap sudo snap install snapcraft --classic - sudo snap install lxd - sudo lxd init --auto mkdir -p snap/gui cp assets/icon/icon_1024.png snap/gui/gopeed.png cat>snap/snapcraft.yaml< Date: Fri, 27 Oct 2023 17:44:54 +0800 Subject: [PATCH 15/37] fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 869019ff9..238aaaef5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -228,8 +228,8 @@ jobs: flutter build linux mkdir -p build/dist - uses: whywaita/setup-lxd@v1 + - name: Build snap run: | - # Build snap sudo snap install snapcraft --classic mkdir -p snap/gui cp assets/icon/icon_1024.png snap/gui/gopeed.png From 634f9344651f5ee2271cda6f0b2569b72cf9049b Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 27 Oct 2023 17:49:36 +0800 Subject: [PATCH 16/37] fix --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 238aaaef5..64cd3e1d2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -230,6 +230,7 @@ jobs: - uses: whywaita/setup-lxd@v1 - name: Build snap run: | + cd ui/flutter sudo snap install snapcraft --classic mkdir -p snap/gui cp assets/icon/icon_1024.png snap/gui/gopeed.png From bd9e3c35ccdf25b475383c07654e57dcc0688c68 Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 27 Oct 2023 17:55:42 +0800 Subject: [PATCH 17/37] fix --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 64cd3e1d2..0bfa44499 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -229,6 +229,8 @@ jobs: mkdir -p build/dist - uses: whywaita/setup-lxd@v1 - name: Build snap + env: + VERSION: ${{ needs.get-release.outputs.tag_name }} run: | cd ui/flutter sudo snap install snapcraft --classic From 7866cc056863979aa5773eae84049a69aabb57a3 Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 27 Oct 2023 18:04:46 +0800 Subject: [PATCH 18/37] fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0bfa44499..45cda7055 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -227,7 +227,7 @@ jobs: cd ui/flutter flutter build linux mkdir -p build/dist - - uses: whywaita/setup-lxd@v1 + - uses: canonical/setup-lxd - name: Build snap env: VERSION: ${{ needs.get-release.outputs.tag_name }} From ebe8d517c898409a85f693139443ef602be0119f Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 27 Oct 2023 18:09:27 +0800 Subject: [PATCH 19/37] fix --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45cda7055..c262d70cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -227,7 +227,10 @@ jobs: cd ui/flutter flutter build linux mkdir -p build/dist - - uses: canonical/setup-lxd + - name: Setup LXD + uses: canonical/setup-lxd@v0.1.1 + with: + channel: latest/stable - name: Build snap env: VERSION: ${{ needs.get-release.outputs.tag_name }} From 5fe7a1b286af20275fbe28ff74dca8e4c82e7d18 Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 27 Oct 2023 18:21:40 +0800 Subject: [PATCH 20/37] fix --- .github/workflows/build.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c262d70cb..75ac8aa66 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -219,6 +219,10 @@ jobs: - run: | sudo apt-get update -y sudo apt-get install -y ninja-build libgtk-3-dev libayatana-appindicator3-dev + - name: Setup LXD + uses: canonical/setup-lxd@v0.1.1 + with: + channel: latest/stable - name: Build env: VERSION: ${{ needs.get-release.outputs.tag_name }} @@ -227,14 +231,9 @@ jobs: cd ui/flutter flutter build linux mkdir -p build/dist - - name: Setup LXD - uses: canonical/setup-lxd@v0.1.1 - with: - channel: latest/stable - - name: Build snap - env: - VERSION: ${{ needs.get-release.outputs.tag_name }} - run: | + + + # Build snap cd ui/flutter sudo snap install snapcraft --classic mkdir -p snap/gui @@ -262,7 +261,7 @@ jobs: apps: gopeed: command: gopeed - extensions: [gnome] + extensions: [flutter-stable] plugs: - network slots: From 916874d599c5da784ac65d2acb11e55e4eb505ee Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 27 Oct 2023 18:26:51 +0800 Subject: [PATCH 21/37] fix --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 75ac8aa66..d0a94db0b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -234,7 +234,6 @@ jobs: # Build snap - cd ui/flutter sudo snap install snapcraft --classic mkdir -p snap/gui cp assets/icon/icon_1024.png snap/gui/gopeed.png From d58421e4f6fa631ba8866744a3b7fbc8380e3ce8 Mon Sep 17 00:00:00 2001 From: Levi Date: Fri, 27 Oct 2023 22:13:01 +0800 Subject: [PATCH 22/37] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d0a94db0b..35da54278 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -229,7 +229,7 @@ jobs: run: | go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop cd ui/flutter - flutter build linux + # flutter build linux mkdir -p build/dist From b0f84993daecb366ee2cf51fc60abbbd8d83be80 Mon Sep 17 00:00:00 2001 From: liwei Date: Tue, 31 Oct 2023 15:20:56 +0800 Subject: [PATCH 23/37] test --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35da54278..2640b12f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -244,7 +244,7 @@ jobs: description: High speed downloader that supports all platforms. confinement: strict - base: core18 + base: core22 grade: stable architectures: @@ -260,7 +260,7 @@ jobs: apps: gopeed: command: gopeed - extensions: [flutter-stable] + extensions: [gnome] plugs: - network slots: From 44fb137995b83f3ee707c204ed0e5602af09cf3e Mon Sep 17 00:00:00 2001 From: liwei Date: Tue, 31 Oct 2023 15:27:07 +0800 Subject: [PATCH 24/37] test --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2640b12f5..af436befb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -249,7 +249,7 @@ jobs: architectures: - build-on: amd64 - run-on: [amd64] + build-for: arm64 slots: dbus-gopeed: @@ -269,6 +269,8 @@ jobs: gopeed: source: . plugin: flutter + stage-packages: + - libayatana-appindicator3-dev flutter-target: lib/main.dart EOF From c1c5d30e329d96fd0d606bcc3716c00382580e8b Mon Sep 17 00:00:00 2001 From: liwei Date: Tue, 31 Oct 2023 15:42:52 +0800 Subject: [PATCH 25/37] test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index af436befb..3f8c74f04 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -249,7 +249,7 @@ jobs: architectures: - build-on: amd64 - build-for: arm64 + build-for: amd64 slots: dbus-gopeed: From 80d9d76ed9e19d74000308aecbf2771221fef135 Mon Sep 17 00:00:00 2001 From: liwei Date: Tue, 31 Oct 2023 17:08:55 +0800 Subject: [PATCH 26/37] test --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3f8c74f04..b1096f525 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -289,8 +289,9 @@ jobs: EOF snapcraft --use-lxd - mv gopeed_*_amd64.snap build/dist/Gopeed-$VERSION-linux-amd64.snap - + # Snapcraft login + export SNAPCRAFT_LOGIN_TOKEN=${{ secrets.SNAP_STORE_LOGIN }} + snapcraft upload --release=edge gopeed_${VERSION:1}_amd64.snap - name: Upload uses: shogo82148/actions-upload-release-asset@v1 with: From 884cedf100b26a9b97327444ff8415dbedd379b0 Mon Sep 17 00:00:00 2001 From: liwei Date: Tue, 31 Oct 2023 17:34:23 +0800 Subject: [PATCH 27/37] test --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b1096f525..bde69d4d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -290,6 +290,7 @@ jobs: snapcraft --use-lxd # Snapcraft login + apt install gnome-keyring -y export SNAPCRAFT_LOGIN_TOKEN=${{ secrets.SNAP_STORE_LOGIN }} snapcraft upload --release=edge gopeed_${VERSION:1}_amd64.snap - name: Upload From a12b377d1870cda0fb960ceaa75c3cbd8e28fb63 Mon Sep 17 00:00:00 2001 From: liwei Date: Tue, 31 Oct 2023 17:53:21 +0800 Subject: [PATCH 28/37] test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bde69d4d9..b865feb34 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -290,7 +290,7 @@ jobs: snapcraft --use-lxd # Snapcraft login - apt install gnome-keyring -y + sudo apt install gnome-keyring -y export SNAPCRAFT_LOGIN_TOKEN=${{ secrets.SNAP_STORE_LOGIN }} snapcraft upload --release=edge gopeed_${VERSION:1}_amd64.snap - name: Upload From 0d637b83d5bbf19a348aca20b4b0a6c300e25728 Mon Sep 17 00:00:00 2001 From: liwei Date: Tue, 31 Oct 2023 18:19:11 +0800 Subject: [PATCH 29/37] test --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b865feb34..c7488ec48 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -288,11 +288,12 @@ jobs: Keywords=Flutter;Downloader; EOF - snapcraft --use-lxd + # snapcraft --use-lxd # Snapcraft login sudo apt install gnome-keyring -y export SNAPCRAFT_LOGIN_TOKEN=${{ secrets.SNAP_STORE_LOGIN }} - snapcraft upload --release=edge gopeed_${VERSION:1}_amd64.snap + snapcraft whoami + # snapcraft upload --release=edge gopeed_${VERSION:1}_amd64.snap - name: Upload uses: shogo82148/actions-upload-release-asset@v1 with: From 90559bfa8bf33e0d716a8c90e2e10b1a6070a2a4 Mon Sep 17 00:00:00 2001 From: liwei Date: Tue, 31 Oct 2023 18:23:45 +0800 Subject: [PATCH 30/37] test --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c7488ec48..3ef8107c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -219,10 +219,10 @@ jobs: - run: | sudo apt-get update -y sudo apt-get install -y ninja-build libgtk-3-dev libayatana-appindicator3-dev - - name: Setup LXD - uses: canonical/setup-lxd@v0.1.1 - with: - channel: latest/stable +# - name: Setup LXD +# uses: canonical/setup-lxd@v0.1.1 +# with: +# channel: latest/stable - name: Build env: VERSION: ${{ needs.get-release.outputs.tag_name }} @@ -291,7 +291,7 @@ jobs: # snapcraft --use-lxd # Snapcraft login sudo apt install gnome-keyring -y - export SNAPCRAFT_LOGIN_TOKEN=${{ secrets.SNAP_STORE_LOGIN }} + export SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.SNAP_STORE_LOGIN }} snapcraft whoami # snapcraft upload --release=edge gopeed_${VERSION:1}_amd64.snap - name: Upload From 87a84dd04bd974ac4720ad9c00b2d6663b3df295 Mon Sep 17 00:00:00 2001 From: liwei Date: Tue, 31 Oct 2023 18:34:07 +0800 Subject: [PATCH 31/37] test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ef8107c1..ad60c2b6b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -290,7 +290,7 @@ jobs: # snapcraft --use-lxd # Snapcraft login - sudo apt install gnome-keyring -y + # sudo apt install gnome-keyring -y export SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.SNAP_STORE_LOGIN }} snapcraft whoami # snapcraft upload --release=edge gopeed_${VERSION:1}_amd64.snap From 8a45464a0fb779e84be79a8a67122bd248948c66 Mon Sep 17 00:00:00 2001 From: liwei Date: Tue, 31 Oct 2023 18:44:20 +0800 Subject: [PATCH 32/37] test --- .github/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad60c2b6b..1f93f6f92 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -219,10 +219,10 @@ jobs: - run: | sudo apt-get update -y sudo apt-get install -y ninja-build libgtk-3-dev libayatana-appindicator3-dev -# - name: Setup LXD -# uses: canonical/setup-lxd@v0.1.1 -# with: -# channel: latest/stable + - name: Setup LXD + uses: canonical/setup-lxd@v0.1.1 + with: + channel: latest/stable - name: Build env: VERSION: ${{ needs.get-release.outputs.tag_name }} @@ -288,12 +288,12 @@ jobs: Keywords=Flutter;Downloader; EOF - # snapcraft --use-lxd + snapcraft --use-lxd + # Snapcraft login - # sudo apt install gnome-keyring -y export SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.SNAP_STORE_LOGIN }} snapcraft whoami - # snapcraft upload --release=edge gopeed_${VERSION:1}_amd64.snap + snapcraft upload --release=edge gopeed_${VERSION:1}_amd64.snap - name: Upload uses: shogo82148/actions-upload-release-asset@v1 with: From 96b5b02ba01b1f8fc8ba14486da6058c9337f2a6 Mon Sep 17 00:00:00 2001 From: liwei Date: Wed, 1 Nov 2023 09:10:17 +0800 Subject: [PATCH 33/37] test --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1f93f6f92..fad34aa9c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -237,6 +237,7 @@ jobs: sudo snap install snapcraft --classic mkdir -p snap/gui cp assets/icon/icon_1024.png snap/gui/gopeed.png + cat>snap/snapcraft.yaml< Date: Wed, 1 Nov 2023 12:00:23 +0800 Subject: [PATCH 34/37] update --- .github/workflows/build.yml | 104 ++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fad34aa9c..62ba956a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -232,6 +232,110 @@ jobs: # flutter build linux mkdir -p build/dist + # Build portable + tar -czaf build/dist/Gopeed-$VERSION-linux-amd64-portable.tar.gz build/linux/x64/release/bundle + + + # Build deb package + mkdir -p debian/gui + cp assets/icon/icon_1024.png debian/gui/gopeed.png + cat>debian/debian.yaml<debian/gui/gopeed.desktop<AppImageBuilder.yml< Date: Wed, 1 Nov 2023 13:34:03 +0800 Subject: [PATCH 35/37] update --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 62ba956a4..4723c26cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -229,7 +229,7 @@ jobs: run: | go build -tags nosqlite -ldflags="-w -s" -buildmode=c-shared -o ui/flutter/linux/bundle/lib/libgopeed.so github.com/GopeedLab/gopeed/bind/desktop cd ui/flutter - # flutter build linux + flutter build linux mkdir -p build/dist # Build portable From 7d5756a5353fe2658d47243683d15344a4711b81 Mon Sep 17 00:00:00 2001 From: liwei Date: Wed, 1 Nov 2023 13:49:01 +0800 Subject: [PATCH 36/37] update --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4723c26cf..9ef20427f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -339,6 +339,7 @@ jobs: # Build snap sudo snap install snapcraft --classic + rm -rf build/linux mkdir -p snap/gui cp assets/icon/icon_1024.png snap/gui/gopeed.png From 7362081992a6287ec365b819174182fb11c1ebee Mon Sep 17 00:00:00 2001 From: liwei Date: Wed, 1 Nov 2023 14:30:57 +0800 Subject: [PATCH 37/37] update --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ef20427f..2b290bba1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -398,7 +398,7 @@ jobs: # Snapcraft login export SNAPCRAFT_STORE_CREDENTIALS=${{ secrets.SNAP_STORE_LOGIN }} - snapcraft upload --release=edge gopeed_${VERSION:1}_amd64.snap + snapcraft upload --release=stable gopeed_${VERSION:1}_amd64.snap - name: Upload uses: shogo82148/actions-upload-release-asset@v1 with: