From f65c6a70d2b37e9637497d0bf66cb0e6b20d3170 Mon Sep 17 00:00:00 2001 From: Pau Giuli Date: Sun, 1 Oct 2023 13:41:07 +0200 Subject: [PATCH 1/9] Added Linux Mint to scripts --- deps.sh | 3 +++ install.sh | 2 ++ package.sh | 3 +++ 3 files changed, 8 insertions(+) diff --git a/deps.sh b/deps.sh index 78c6ce5..9660750 100755 --- a/deps.sh +++ b/deps.sh @@ -7,5 +7,8 @@ if [[ -f "/etc/os-release" ]]; then sudo apt install wireguard-tools libgtk-3-dev libayatana-appindicator3-dev golang-go resolvconf elif [[ "${ID}" == "debian" ]]; then sudo apt install wireguard-tools libgtk-3-dev libayatana-appindicator3-dev golang-go resolvconf + elif [[ "${ID}" == "linuxmint" ]]; then + sudo apt install wireguard-tools libgtk-3-dev libayatana-appindicator3-dev golang-go resolvconf + fi fi diff --git a/install.sh b/install.sh index 958f673..247c728 100755 --- a/install.sh +++ b/install.sh @@ -5,6 +5,8 @@ if [[ -f "/etc/os-release" ]]; then #sudo rpm elif [[ "${ID}" == "ubuntu" ]]; then sudo dpkg -i ./build/wireguird_amd64.deb + elif [[ "${ID}" == "linuxmint" ]]; then + sudo dpkg -i ./build/wireguird_amd64.deb fi fi diff --git a/package.sh b/package.sh index c0fb9e9..3932e0c 100755 --- a/package.sh +++ b/package.sh @@ -7,5 +7,8 @@ if [[ -f "/etc/os-release" ]]; then elif [[ "${ID}" == "ubuntu" ]]; then echo "deb package" ./package_deb.sh + elif [[ "${ID}" == "linuxmint" ]]; then + echo "deb package" + ./package_deb.sh fi fi From 0ed8902ea4546703952285dedcdce6a854845658 Mon Sep 17 00:00:00 2001 From: Pau Giuli <76668405+pgiuli@users.noreply.github.com> Date: Sun, 1 Oct 2023 14:09:29 +0200 Subject: [PATCH 2/9] Create build workflow --- .github/workflows/deb.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/deb.yml diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml new file mode 100644 index 0000000..366adc5 --- /dev/null +++ b/.github/workflows/deb.yml @@ -0,0 +1,29 @@ +# This workflow will build a golang project +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go + +name: Build wireguird .deb + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Set up Go + uses: actions/setup-go@v4 + with: + go-version: '1.20' + + - name: Install Dependencies + run: deps.sh + + - name: Build + run: package_deb.sh + From ef4572e1c0eacc3e86fa09103471d39853e64522 Mon Sep 17 00:00:00 2001 From: Pau Giuli <76668405+pgiuli@users.noreply.github.com> Date: Sun, 1 Oct 2023 14:10:32 +0200 Subject: [PATCH 3/9] Update deb.yml --- .github/workflows/deb.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml index 366adc5..ebd2b13 100644 --- a/.github/workflows/deb.yml +++ b/.github/workflows/deb.yml @@ -21,9 +21,6 @@ jobs: with: go-version: '1.20' - - name: Install Dependencies - run: deps.sh - - name: Build run: package_deb.sh From 51769fe9bf0aaf207dc75c132159d9582204337a Mon Sep 17 00:00:00 2001 From: Pau Giuli Date: Sun, 1 Oct 2023 16:01:46 +0200 Subject: [PATCH 4/9] Updated workflow file --- .github/workflows/deb.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml index ebd2b13..00f6b5e 100644 --- a/.github/workflows/deb.yml +++ b/.github/workflows/deb.yml @@ -21,6 +21,16 @@ jobs: with: go-version: '1.20' - - name: Build - run: package_deb.sh + - name: Install Package Dependencies + run: | + echo "resolvconf resolvconf/linkify-resolvconf boolean false" | debconf-set-selections + sudo apt-get update + sudo apt-get install -y wireguard-tools libgtk-3-dev libayatana-appindicator3-dev golang-go resolvconf + + - name: Build .deb + run: | + chmod +x *.sh + ./package_deb.sh + + From 4a01a90f97f5498ca0516955e8dcd8f989fbd296 Mon Sep 17 00:00:00 2001 From: Pau Giuli Date: Sun, 1 Oct 2023 16:03:46 +0200 Subject: [PATCH 5/9] Removed dependency install --- .github/workflows/deb.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml index 00f6b5e..919d5d4 100644 --- a/.github/workflows/deb.yml +++ b/.github/workflows/deb.yml @@ -21,11 +21,11 @@ jobs: with: go-version: '1.20' - - name: Install Package Dependencies - run: | - echo "resolvconf resolvconf/linkify-resolvconf boolean false" | debconf-set-selections - sudo apt-get update - sudo apt-get install -y wireguard-tools libgtk-3-dev libayatana-appindicator3-dev golang-go resolvconf +# - name: Install Package Dependencies +# run: | +# echo "resolvconf resolvconf/linkify-resolvconf boolean false" | debconf-set-selections +# sudo apt-get update +# sudo apt-get install -y wireguard-tools libgtk-3-dev libayatana-appindicator3-dev golang-go resolvconf - name: Build .deb run: | From a1520de5924170662538979a789ea78fb7b6ac85 Mon Sep 17 00:00:00 2001 From: Pau Giuli Date: Sun, 1 Oct 2023 16:08:58 +0200 Subject: [PATCH 6/9] Added package install test --- .github/workflows/deb.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml index 919d5d4..d2b222d 100644 --- a/.github/workflows/deb.yml +++ b/.github/workflows/deb.yml @@ -31,6 +31,10 @@ jobs: run: | chmod +x *.sh ./package_deb.sh + + - name: Install package + run: | + dpkg -i ./build/wireguird_amd64.deb From 8fd8d010be2d2fb16314b784b1a9185a22acfb98 Mon Sep 17 00:00:00 2001 From: Pau Giuli Date: Sun, 1 Oct 2023 16:18:32 +0200 Subject: [PATCH 7/9] Added sudo to install test --- .github/workflows/deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml index d2b222d..199b742 100644 --- a/.github/workflows/deb.yml +++ b/.github/workflows/deb.yml @@ -34,7 +34,7 @@ jobs: - name: Install package run: | - dpkg -i ./build/wireguird_amd64.deb + sudo dpkg -i ./build/wireguird_amd64.deb From 78278f3b83189489fafb52aed7862a012b8ea51e Mon Sep 17 00:00:00 2001 From: Pau Giuli Date: Sun, 1 Oct 2023 16:40:58 +0200 Subject: [PATCH 8/9] Added built package dependencies install --- .github/workflows/deb.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml index 199b742..5bb306d 100644 --- a/.github/workflows/deb.yml +++ b/.github/workflows/deb.yml @@ -35,6 +35,7 @@ jobs: - name: Install package run: | sudo dpkg -i ./build/wireguird_amd64.deb + sudo apt-get -f install From b51206c323cbb4a9d96bb2d2771ac80a760188f1 Mon Sep 17 00:00:00 2001 From: Pau Giuli Date: Sun, 1 Oct 2023 16:45:42 +0200 Subject: [PATCH 9/9] Replaced dpkg with APT --- .github/workflows/deb.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml index 5bb306d..1f98acc 100644 --- a/.github/workflows/deb.yml +++ b/.github/workflows/deb.yml @@ -34,8 +34,8 @@ jobs: - name: Install package run: | - sudo dpkg -i ./build/wireguird_amd64.deb - sudo apt-get -f install + sudo apt install ./build/wireguird_amd64.deb +