From 42db9773f4184f8877bcafb96d70ffb0bc54df92 Mon Sep 17 00:00:00 2001 From: Bethuel Mmbaga Date: Mon, 10 Jul 2023 22:09:16 +0300 Subject: [PATCH] Remove unused netbird UI dependencies (#1007) * remove unused netbird-ui dependencies in deb package * build netbird-ui with support for legacy appindicator * add rpm package dendencies * add binary build package * remove dependencies --- .github/workflows/release.yml | 2 +- .goreleaser_ui.yaml | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 09ea43ab3..1a3c04f5d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -116,7 +116,7 @@ jobs: run: git --no-pager diff --exit-code - name: Install dependencies - run: sudo apt update && sudo apt install -y -q libgtk-3-dev libayatana-appindicator3-dev libgl1-mesa-dev xorg-dev gcc-mingw-w64-x86-64 + run: sudo apt update && sudo apt install -y -q libappindicator3-dev gir1.2-appindicator3-0.1 libxxf86vm-dev gcc-mingw-w64-x86-64 - name: Install rsrc run: go install github.com/akavel/rsrc@v0.10.2 - name: Generate windows rsrc diff --git a/.goreleaser_ui.yaml b/.goreleaser_ui.yaml index 197eab3f8..c6f7a7c34 100644 --- a/.goreleaser_ui.yaml +++ b/.goreleaser_ui.yaml @@ -11,6 +11,8 @@ builds: - amd64 ldflags: - -s -w -X github.com/netbirdio/netbird/version.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser + tags: + - legacy_appindicator mod_timestamp: '{{ .CommitTimestamp }}' - id: netbird-ui-windows @@ -55,9 +57,6 @@ nfpms: - src: client/ui/disconnected.png dst: /usr/share/pixmaps/netbird.png dependencies: - - libayatana-appindicator3-1 - - libgtk-3-dev - - libappindicator3-dev - netbird - maintainer: Netbird @@ -75,9 +74,6 @@ nfpms: - src: client/ui/disconnected.png dst: /usr/share/pixmaps/netbird.png dependencies: - - libayatana-appindicator3-1 - - libgtk-3-dev - - libappindicator3-dev - netbird uploads: