From 8b104178631baabd9df2d3293274e1111b95b836 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 24 Dec 2020 17:33:40 +0100 Subject: [PATCH 01/24] Add auto build --- .github/workflows/autobuild_deb.yml | 26 +++++++++++++ distributions/autobuilddeb/control | 43 ++++++++++++++++++++++ distributions/build-debian-package-auto.sh | 27 ++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 .github/workflows/autobuild_deb.yml create mode 100644 distributions/autobuilddeb/control create mode 100755 distributions/build-debian-package-auto.sh diff --git a/.github/workflows/autobuild_deb.yml b/.github/workflows/autobuild_deb.yml new file mode 100644 index 0000000000..09d0b619dc --- /dev/null +++ b/.github/workflows/autobuild_deb.yml @@ -0,0 +1,26 @@ +name: "pre-release" + +on: + push: + branches: + - "autobuild_linux" +jobs: + pre-release: + name: "Pre Release" + runs-on: "ubuntu-latest" + + steps: + # ... + - name: Checkout Project + uses: actions/checkout@v1 + - name: "Build & test" + run: cd distributions; sudo apt-get -qq update; sudo apt-get -qq -y upgrade; sudo apt-get -qq -y install devscripts build-essential debhelper libjack-jackd2-dev qtbase5-dev qttools5-dev-tools; mv debian ..; cd ..; debuild -b -us -uc; mv debian distributions; cd ..; cp *.deb jamulus/ + + - uses: "marvinpinto/action-automatic-releases@latest" + with: + repo_token: "${{ secrets.GITHUB_TOKEN }}" + automatic_release_tag: "latest" + prerelease: true + title: "Development Build" + files: | + *.deb diff --git a/distributions/autobuilddeb/control b/distributions/autobuilddeb/control new file mode 100644 index 0000000000..d19f36e51a --- /dev/null +++ b/distributions/autobuilddeb/control @@ -0,0 +1,43 @@ +Source: jamulus +Section: sound +Priority: optional +Maintainer: "corrados" +Build-Depends: + debhelper (>= 9), + libjack-jackd2-dev, + qtbase5-dev, + qttools5-dev-tools, +Standards-Version: é&%JAMVERSION%&è +Homepage: https://jamulus.io +Vcs-Git: git://github.com/corrados/jamulus.git +Vcs-Browser: https://github.com/corrados/jamulus + +Package: jamulus +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, +Description: Low latency Audio Server/Client + The Jamulus software enables musicians to perform real-time jam sessions over + the internet. There is one server running the Jamulus server software which + collects the audio data from each Jamulus client, mixes the audio data and + sends the mix back to each client. + . + It runs on Windows / macOS / Linux. + +Package: jamulus-headless +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + adduser, +Description: Low latency Audio Server (headless) + The Jamulus software enables musicians to perform real-time jam sessions over + the internet. There is one server running the Jamulus server software which + collects the audio data from each Jamulus client, mixes the audio data and + sends the mix back to each client. + . + It runs on Windows / macOS / Linux. + . + This package contains a Jamulus binary built for headless operation + (without GUI library dependencies) and a jamulus-headless systemd service. diff --git a/distributions/build-debian-package-auto.sh b/distributions/build-debian-package-auto.sh new file mode 100755 index 0000000000..1ae2a142e4 --- /dev/null +++ b/distributions/build-debian-package-auto.sh @@ -0,0 +1,27 @@ +#!/bin/sh -e + +echo "Update system..." +sudo apt-get -qq update +sudo apt-get -qq -y upgrade +echo "Install dependencies..." + +sudo apt-get -qq -y install devscripts build-essential \ + debhelper libjack-jackd2-dev qtbase5-dev qttools5-dev-tools + +cp -r debian .. +cd .. + +# patch the control file +# get the jamulus version from pro file +VERSION=$(cat Jamulus.pro | grep -oP 'VERSION = \K\w[^\s\\]*') +# move the modified control file here + +cp distributions/autobuilddeb/control debian/control + +echo "${VERSION} building..." + +sed -i "s/é&%JAMVERSION%&è/${VERSION}/g" debian/control +debuild -b -us -uc + +# copy for auto release +cp ../*.deb ./ From 6fc346b8c6bdcc91ba5ae919a5a3be79dcbf2884 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 24 Dec 2020 17:35:47 +0100 Subject: [PATCH 02/24] Execute script --- .github/workflows/autobuild_deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autobuild_deb.yml b/.github/workflows/autobuild_deb.yml index 09d0b619dc..4b67bff947 100644 --- a/.github/workflows/autobuild_deb.yml +++ b/.github/workflows/autobuild_deb.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout Project uses: actions/checkout@v1 - name: "Build & test" - run: cd distributions; sudo apt-get -qq update; sudo apt-get -qq -y upgrade; sudo apt-get -qq -y install devscripts build-essential debhelper libjack-jackd2-dev qtbase5-dev qttools5-dev-tools; mv debian ..; cd ..; debuild -b -us -uc; mv debian distributions; cd ..; cp *.deb jamulus/ + run: cd distributions; sudo build-debian-package-auto.sh - uses: "marvinpinto/action-automatic-releases@latest" with: From e8848ee39df240b89c9702b9ebd6ed6bf583bff1 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 24 Dec 2020 17:36:45 +0100 Subject: [PATCH 03/24] Fix typo --- .github/workflows/autobuild_deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autobuild_deb.yml b/.github/workflows/autobuild_deb.yml index 4b67bff947..e31041c185 100644 --- a/.github/workflows/autobuild_deb.yml +++ b/.github/workflows/autobuild_deb.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout Project uses: actions/checkout@v1 - name: "Build & test" - run: cd distributions; sudo build-debian-package-auto.sh + run: cd distributions; sudo ./build-debian-package-auto.sh - uses: "marvinpinto/action-automatic-releases@latest" with: From c7a97cc57fe063a7692dc01ae5ca7da8f13743ea Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 24 Dec 2020 17:38:03 +0100 Subject: [PATCH 04/24] Cosmetic changes --- .github/workflows/autobuild_deb.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/autobuild_deb.yml b/.github/workflows/autobuild_deb.yml index e31041c185..d3b9882edb 100644 --- a/.github/workflows/autobuild_deb.yml +++ b/.github/workflows/autobuild_deb.yml @@ -1,4 +1,4 @@ -name: "pre-release" +name: "Autobuild deb" on: push: @@ -8,14 +8,11 @@ jobs: pre-release: name: "Pre Release" runs-on: "ubuntu-latest" - steps: - # ... - name: Checkout Project uses: actions/checkout@v1 - - name: "Build & test" + - name: "Build package" run: cd distributions; sudo ./build-debian-package-auto.sh - - uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" From 4a0b0663856408f79ae7e6fee29ba798636dcbf8 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 24 Dec 2020 18:00:06 +0100 Subject: [PATCH 05/24] Change tag to nightly --- .github/workflows/autobuild_deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autobuild_deb.yml b/.github/workflows/autobuild_deb.yml index d3b9882edb..0a31b1735f 100644 --- a/.github/workflows/autobuild_deb.yml +++ b/.github/workflows/autobuild_deb.yml @@ -16,7 +16,7 @@ jobs: - uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "latest" + automatic_release_tag: "nightly" prerelease: true title: "Development Build" files: | From 3fee931990753e85193a4c1435c071dde6c8678e Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 24 Dec 2020 20:41:43 +0100 Subject: [PATCH 06/24] Add changelog auto update --- distributions/build-debian-package-auto.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/distributions/build-debian-package-auto.sh b/distributions/build-debian-package-auto.sh index 1ae2a142e4..b1c1d50f7b 100755 --- a/distributions/build-debian-package-auto.sh +++ b/distributions/build-debian-package-auto.sh @@ -11,9 +11,19 @@ sudo apt-get -qq -y install devscripts build-essential \ cp -r debian .. cd .. -# patch the control file # get the jamulus version from pro file VERSION=$(cat Jamulus.pro | grep -oP 'VERSION = \K\w[^\s\\]*') + +# patch changelog +DATE=$(date "+%a, %d %B %Y %T %Z" ) +echo "-- GitHub Actions ${DATE}" >> debian/changelog +echo "" >> debian/changelog +echo "* See GitHub releases for changelog" +echo "" >> debian/changelog +echo "jamulus (${VERSION}-0) UNRELEASED; urgency=medium" >> debian/changelog + + +# patch the control file # move the modified control file here cp distributions/autobuilddeb/control debian/control From dd7623d6468dfd8e9c62fa8154d1e20d81002122 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Thu, 24 Dec 2020 20:42:28 +0100 Subject: [PATCH 07/24] Update build-debian-package-auto.sh --- distributions/build-debian-package-auto.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributions/build-debian-package-auto.sh b/distributions/build-debian-package-auto.sh index b1c1d50f7b..e9d2ec8678 100755 --- a/distributions/build-debian-package-auto.sh +++ b/distributions/build-debian-package-auto.sh @@ -18,7 +18,7 @@ VERSION=$(cat Jamulus.pro | grep -oP 'VERSION = \K\w[^\s\\]*') DATE=$(date "+%a, %d %B %Y %T %Z" ) echo "-- GitHub Actions ${DATE}" >> debian/changelog echo "" >> debian/changelog -echo "* See GitHub releases for changelog" +echo "* See GitHub releases for changelog" >> debian/changelog echo "" >> debian/changelog echo "jamulus (${VERSION}-0) UNRELEASED; urgency=medium" >> debian/changelog From 346e453c35245ae917d00185aed4bf52a162b542 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 25 Dec 2020 00:05:02 +0100 Subject: [PATCH 08/24] Hacky way to add changes --- distributions/build-debian-package-auto.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/distributions/build-debian-package-auto.sh b/distributions/build-debian-package-auto.sh index e9d2ec8678..239e9115d1 100755 --- a/distributions/build-debian-package-auto.sh +++ b/distributions/build-debian-package-auto.sh @@ -14,17 +14,18 @@ cd .. # get the jamulus version from pro file VERSION=$(cat Jamulus.pro | grep -oP 'VERSION = \K\w[^\s\\]*') -# patch changelog +# patch changelog (with hack) + DATE=$(date "+%a, %d %B %Y %T %Z" ) -echo "-- GitHub Actions ${DATE}" >> debian/changelog +echo "jamulus (${VERSION}-0) UNRELEASED; urgency=medium" > debian/changelog echo "" >> debian/changelog -echo "* See GitHub releases for changelog" >> debian/changelog +echo " * See GitHub releases for changelog" >> debian/changelog echo "" >> debian/changelog -echo "jamulus (${VERSION}-0) UNRELEASED; urgency=medium" >> debian/changelog - +echo "-- GitHub Actions ${DATE}" >> debian/changelog +cat distributions/debian/changelog >> debian/changelog # patch the control file -# move the modified control file here +# cp the modified control file here cp distributions/autobuilddeb/control debian/control From c1c8ec574b22c31aec55bcc644a240e573b6ba45 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 25 Dec 2020 00:53:00 +0100 Subject: [PATCH 09/24] Add armhf --- distributions/build-debian-package-auto.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/distributions/build-debian-package-auto.sh b/distributions/build-debian-package-auto.sh index 239e9115d1..d3bfc16216 100755 --- a/distributions/build-debian-package-auto.sh +++ b/distributions/build-debian-package-auto.sh @@ -1,5 +1,8 @@ #!/bin/sh -e +# set armhf +sudo dpkg --add-architecture armhf + echo "Update system..." sudo apt-get -qq update sudo apt-get -qq -y upgrade @@ -34,5 +37,8 @@ echo "${VERSION} building..." sed -i "s/é&%JAMVERSION%&è/${VERSION}/g" debian/control debuild -b -us -uc +echo "Build armhf" + +debuilf -b -us -uc -aarmhf # copy for auto release cp ../*.deb ./ From a1b639613147a9cc64e1909a257b3b942a03d475 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 25 Dec 2020 00:57:33 +0100 Subject: [PATCH 10/24] Update build-debian-package-auto.sh --- distributions/build-debian-package-auto.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributions/build-debian-package-auto.sh b/distributions/build-debian-package-auto.sh index d3bfc16216..2084962f24 100755 --- a/distributions/build-debian-package-auto.sh +++ b/distributions/build-debian-package-auto.sh @@ -1,7 +1,7 @@ #!/bin/sh -e # set armhf -sudo dpkg --add-architecture armhf +#sudo dpkg --add-architecture armhf echo "Update system..." sudo apt-get -qq update From 7f68fa782d24134146c9d886d78f7c5185b4b9ca Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 25 Dec 2020 10:07:20 +0100 Subject: [PATCH 11/24] Typo fixed --- distributions/build-debian-package-auto.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/distributions/build-debian-package-auto.sh b/distributions/build-debian-package-auto.sh index 2084962f24..86a4ab5622 100755 --- a/distributions/build-debian-package-auto.sh +++ b/distributions/build-debian-package-auto.sh @@ -25,6 +25,7 @@ echo "" >> debian/changelog echo " * See GitHub releases for changelog" >> debian/changelog echo "" >> debian/changelog echo "-- GitHub Actions ${DATE}" >> debian/changelog +echo "" >> debian/changelog cat distributions/debian/changelog >> debian/changelog # patch the control file @@ -39,6 +40,6 @@ debuild -b -us -uc echo "Build armhf" -debuilf -b -us -uc -aarmhf +debuild -b -us -uc -aarmhf # copy for auto release cp ../*.deb ./ From 6d0a9b27d06028a031b2741d867a70c0137d6a64 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 25 Dec 2020 10:27:16 +0100 Subject: [PATCH 12/24] Update build-debian-package-auto.sh --- distributions/build-debian-package-auto.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributions/build-debian-package-auto.sh b/distributions/build-debian-package-auto.sh index 86a4ab5622..98d3ab55f3 100755 --- a/distributions/build-debian-package-auto.sh +++ b/distributions/build-debian-package-auto.sh @@ -9,7 +9,7 @@ sudo apt-get -qq -y upgrade echo "Install dependencies..." sudo apt-get -qq -y install devscripts build-essential \ - debhelper libjack-jackd2-dev qtbase5-dev qttools5-dev-tools + debhelper libjack-jackd2-dev qtbase5-dev qttools5-dev-tools gcc-arm-linux-gnueabihf cp -r debian .. cd .. From b575da8c3b6a2c24228c52ed4af6522556d5e84b Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 25 Dec 2020 10:40:44 +0100 Subject: [PATCH 13/24] Remove armhf --- distributions/build-debian-package-auto.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/distributions/build-debian-package-auto.sh b/distributions/build-debian-package-auto.sh index 98d3ab55f3..844dad0048 100755 --- a/distributions/build-debian-package-auto.sh +++ b/distributions/build-debian-package-auto.sh @@ -9,7 +9,7 @@ sudo apt-get -qq -y upgrade echo "Install dependencies..." sudo apt-get -qq -y install devscripts build-essential \ - debhelper libjack-jackd2-dev qtbase5-dev qttools5-dev-tools gcc-arm-linux-gnueabihf + debhelper libjack-jackd2-dev qtbase5-dev qttools5-dev-tools # gcc-arm-linux-gnueabihf cp -r debian .. cd .. @@ -38,8 +38,8 @@ echo "${VERSION} building..." sed -i "s/é&%JAMVERSION%&è/${VERSION}/g" debian/control debuild -b -us -uc -echo "Build armhf" +#echo "Build armhf" -debuild -b -us -uc -aarmhf +#debuild -b -us -uc -aarmhf # copy for auto release cp ../*.deb ./ From 3027891d63e8aace5c22ae399542a2a5dd184529 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 25 Dec 2020 21:08:58 +0100 Subject: [PATCH 14/24] Change OS to ubuntu 16.04 --- .github/workflows/autobuild_deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autobuild_deb.yml b/.github/workflows/autobuild_deb.yml index 0a31b1735f..0631a69c38 100644 --- a/.github/workflows/autobuild_deb.yml +++ b/.github/workflows/autobuild_deb.yml @@ -7,7 +7,7 @@ on: jobs: pre-release: name: "Pre Release" - runs-on: "ubuntu-latest" + runs-on: "ubuntu-16.04" steps: - name: Checkout Project uses: actions/checkout@v1 From 30bd33b46295c71cf32f88ccad5e5cad925ccce4 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 25 Dec 2020 21:46:43 +0100 Subject: [PATCH 15/24] Try build on Ubuntu 20.04 --- .github/workflows/autobuild_deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autobuild_deb.yml b/.github/workflows/autobuild_deb.yml index 0631a69c38..8a7f531dcd 100644 --- a/.github/workflows/autobuild_deb.yml +++ b/.github/workflows/autobuild_deb.yml @@ -7,7 +7,7 @@ on: jobs: pre-release: name: "Pre Release" - runs-on: "ubuntu-16.04" + runs-on: "ubuntu-20.04" steps: - name: Checkout Project uses: actions/checkout@v1 From 53f94c1c77533aebed7e3a63c58272e611e9adde Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 25 Dec 2020 22:03:21 +0100 Subject: [PATCH 16/24] revert back to 16.04 --- .github/workflows/autobuild_deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autobuild_deb.yml b/.github/workflows/autobuild_deb.yml index 8a7f531dcd..0631a69c38 100644 --- a/.github/workflows/autobuild_deb.yml +++ b/.github/workflows/autobuild_deb.yml @@ -7,7 +7,7 @@ on: jobs: pre-release: name: "Pre Release" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-16.04" steps: - name: Checkout Project uses: actions/checkout@v1 From a7ed55314617bd0e1b0b81f0824f8f2e5e8e07be Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 25 Dec 2020 22:15:01 +0100 Subject: [PATCH 17/24] Unsustainably add dependencies --- .github/workflows/autobuild_deb.yml | 2 +- distributions/autobuilddeb/control | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/autobuild_deb.yml b/.github/workflows/autobuild_deb.yml index 0631a69c38..8a7f531dcd 100644 --- a/.github/workflows/autobuild_deb.yml +++ b/.github/workflows/autobuild_deb.yml @@ -7,7 +7,7 @@ on: jobs: pre-release: name: "Pre Release" - runs-on: "ubuntu-16.04" + runs-on: "ubuntu-20.04" steps: - name: Checkout Project uses: actions/checkout@v1 diff --git a/distributions/autobuilddeb/control b/distributions/autobuilddeb/control index d19f36e51a..ea6be31f1f 100644 --- a/distributions/autobuilddeb/control +++ b/distributions/autobuilddeb/control @@ -14,9 +14,7 @@ Vcs-Browser: https://github.com/corrados/jamulus Package: jamulus Architecture: any -Depends: - ${shlibs:Depends}, - ${misc:Depends}, +Depends: libc6 (>= 2.17), libgcc1 (>= 1:3.0), libjack-jackd2-0 (>= 1.9.5~dfsg-14) | libjack-0.116, libqt5core5a (>= 5.5.0), libqt5gui5 (>= 5.0.2) | libqt5gui5-gles (>= 5.0.2), libqt5network5 (>= 5.0.2), libqt5widgets5 (>= 5.2.0), libqt5xml5 (>= 5.0.2), libstdc++6 (>= 5.2) Description: Low latency Audio Server/Client The Jamulus software enables musicians to perform real-time jam sessions over the internet. There is one server running the Jamulus server software which From 2c81bea2719bbab0792d9acbce0b7d11dfffeb6d Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 25 Dec 2020 22:17:08 +0100 Subject: [PATCH 18/24] Temporarily try to install resulting debs --- distributions/build-debian-package-auto.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/distributions/build-debian-package-auto.sh b/distributions/build-debian-package-auto.sh index 844dad0048..f59fa55f53 100755 --- a/distributions/build-debian-package-auto.sh +++ b/distributions/build-debian-package-auto.sh @@ -38,6 +38,7 @@ echo "${VERSION} building..." sed -i "s/é&%JAMVERSION%&è/${VERSION}/g" debian/control debuild -b -us -uc +sudo dpkg -i *.deb #echo "Build armhf" #debuild -b -us -uc -aarmhf From 1b64b57ab87bb121c4dc75d2e0bc212444fab53b Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 25 Dec 2020 22:17:34 +0100 Subject: [PATCH 19/24] Update build-debian-package-auto.sh --- distributions/build-debian-package-auto.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/distributions/build-debian-package-auto.sh b/distributions/build-debian-package-auto.sh index f59fa55f53..eaab75aef9 100755 --- a/distributions/build-debian-package-auto.sh +++ b/distributions/build-debian-package-auto.sh @@ -38,9 +38,10 @@ echo "${VERSION} building..." sed -i "s/é&%JAMVERSION%&è/${VERSION}/g" debian/control debuild -b -us -uc -sudo dpkg -i *.deb #echo "Build armhf" #debuild -b -us -uc -aarmhf # copy for auto release cp ../*.deb ./ + +sudo dpkg -i *.deb From 6b11739e69c6198a3904aaf939818f0905d23ca9 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 25 Dec 2020 23:02:24 +0100 Subject: [PATCH 20/24] 1804 --- .github/workflows/autobuild_deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autobuild_deb.yml b/.github/workflows/autobuild_deb.yml index 8a7f531dcd..da08f4a98e 100644 --- a/.github/workflows/autobuild_deb.yml +++ b/.github/workflows/autobuild_deb.yml @@ -7,7 +7,7 @@ on: jobs: pre-release: name: "Pre Release" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-18.04" steps: - name: Checkout Project uses: actions/checkout@v1 From 912236949e42f0a003f175b6c52e7282b22018cc Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sun, 3 Jan 2021 12:40:29 +0100 Subject: [PATCH 21/24] Update workflow to run on release only --- .github/workflows/autobuild_deb.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/autobuild_deb.yml b/.github/workflows/autobuild_deb.yml index da08f4a98e..ae3ebb1085 100644 --- a/.github/workflows/autobuild_deb.yml +++ b/.github/workflows/autobuild_deb.yml @@ -2,11 +2,11 @@ name: "Autobuild deb" on: push: - branches: - - "autobuild_linux" + tags: + - "r*" jobs: pre-release: - name: "Pre Release" + name: "Release" runs-on: "ubuntu-18.04" steps: - name: Checkout Project @@ -16,8 +16,8 @@ jobs: - uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "nightly" - prerelease: true + automatic_release_tag: "latest" + prerelease: false title: "Development Build" files: | *.deb From c061646cf5fd6aa689b0673819daa6a43daea2dc Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sun, 3 Jan 2021 12:41:17 +0100 Subject: [PATCH 22/24] Try to fix debian changelog --- distributions/build-debian-package-auto.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distributions/build-debian-package-auto.sh b/distributions/build-debian-package-auto.sh index eaab75aef9..0724088123 100755 --- a/distributions/build-debian-package-auto.sh +++ b/distributions/build-debian-package-auto.sh @@ -19,12 +19,12 @@ VERSION=$(cat Jamulus.pro | grep -oP 'VERSION = \K\w[^\s\\]*') # patch changelog (with hack) -DATE=$(date "+%a, %d %B %Y %T %Z" ) +DATE=$(date "+%a, %d %B %Y %T" ) echo "jamulus (${VERSION}-0) UNRELEASED; urgency=medium" > debian/changelog echo "" >> debian/changelog echo " * See GitHub releases for changelog" >> debian/changelog echo "" >> debian/changelog -echo "-- GitHub Actions ${DATE}" >> debian/changelog +echo "-- GitHub Actions ${DATE} + 0" >> debian/changelog echo "" >> debian/changelog cat distributions/debian/changelog >> debian/changelog From ae900b77eab3a6289d1b0959493b4266fd9fc824 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sun, 3 Jan 2021 13:26:54 +0100 Subject: [PATCH 23/24] Rename Development to Automatic --- .github/workflows/autobuild_deb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autobuild_deb.yml b/.github/workflows/autobuild_deb.yml index ae3ebb1085..3ca5b4d9d1 100644 --- a/.github/workflows/autobuild_deb.yml +++ b/.github/workflows/autobuild_deb.yml @@ -18,6 +18,6 @@ jobs: repo_token: "${{ secrets.GITHUB_TOKEN }}" automatic_release_tag: "latest" prerelease: false - title: "Development Build" + title: "Automatic Build" files: | *.deb From 4ad5f62d1815f6fdb4b519f46593bc35621d364a Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sun, 3 Jan 2021 13:31:59 +0100 Subject: [PATCH 24/24] changes to changelog --- distributions/build-debian-package-auto.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributions/build-debian-package-auto.sh b/distributions/build-debian-package-auto.sh index 0724088123..f27b247362 100755 --- a/distributions/build-debian-package-auto.sh +++ b/distributions/build-debian-package-auto.sh @@ -24,7 +24,7 @@ echo "jamulus (${VERSION}-0) UNRELEASED; urgency=medium" > debian/changelog echo "" >> debian/changelog echo " * See GitHub releases for changelog" >> debian/changelog echo "" >> debian/changelog -echo "-- GitHub Actions ${DATE} + 0" >> debian/changelog +echo " -- GitHub Actions ${DATE} +0" >> debian/changelog echo "" >> debian/changelog cat distributions/debian/changelog >> debian/changelog