From b09513d04116bdd5b60c1751a24b091d49c56503 Mon Sep 17 00:00:00 2001 From: Evangelos Ribeiro Tzaras Date: Sun, 28 Mar 2021 18:36:17 +0200 Subject: [PATCH 01/37] Initial debianization Closes #4163 --- debian/changelog | 5 +++++ debian/control | 36 ++++++++++++++++++++++++++++++++++++ debian/copyright | 29 +++++++++++++++++++++++++++++ debian/gbp.conf | 10 ++++++++++ debian/rules | 10 ++++++++++ debian/source/format | 1 + debian/watch | 3 +++ 7 files changed, 94 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/gbp.conf create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000000..1fd4b5da0ce --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +espresso (4.1.5~rc1) unstable; urgency=medium + + * Initial release + + -- Evangelos Ribeiro Tzaras Sun, 28 Mar 2021 17:15:36 +0200 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000000..5464afb7c3b --- /dev/null +++ b/debian/control @@ -0,0 +1,36 @@ +Source: espresso +Section: science +Priority: optional +Maintainer: Espresso Maintainers +Build-Depends: + cmake, + cython3, + debhelper-compat (=13), + fftw3-dev, + libboost-all-dev, + libgsl-dev, + libhdf5-dev, + libhdf5-openmpi-dev, + openmpi-common, +Rules-Requires-Root: no +Standards-Version: 4.5.0 +Vcs-Browser: https://github.com/espressomd/espresso +Vcs-Git: https://github.com/espressomd/espresso.git +Homepage: https://espressomd.org + +Package: espresso +Architecture: any +Depends: + python3, + python3-h5py, + python3-numpy, + python3-opengl, + python3-scipy, + python3-vtk7, + ${misc:Depends}, +Description: Molecular dynamics simulation package + ESPResSo is a highly versatile software package for performing + and analyzing scientific Molecular Dynamics many-particle + simulations of coarse-grained atomistic or bead-spring models + as they are used in soft matter research in physics, chemistry + and molecular biology. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000000..18411b274fc --- /dev/null +++ b/debian/copyright @@ -0,0 +1,29 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: espresso +Upstream-Contact: Espresso mailing list +Source: https://github.com/espressomd/espresso.git +License: GPL-3 + +Files: * +Copyright: 2010-2021 The ESPResSo project + 2002-2010 Max-Planck-Institute for Polymer Research, Theory Group +License: GPL-3 + + +License: GPL-3+ + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation; either version 3 of the License, or (at your option) any later + version. + . + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public License along with + this package; if not, write to the Free Software Foundation, Inc., 51 Franklin + St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public License version 3 + can be found in the file `/usr/share/common-licenses/GPL-3'. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 00000000000..494f58dcfaf --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,10 @@ +[DEFAULT] +debian-branch = python +debian-tag = v%(version)s +debian-tag-msg = %(pkg)s v%(version)s + +[tag] +sign-tags = true + +[dch] +multimaint-merge = true diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000000..6678ea8d20e --- /dev/null +++ b/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +export DEB_BUILD_MAINT_OPTIONS= hardening=+all + +%: + dh $@ + + +override_dh_auto_test: + true diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000000..89ae9db8f88 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000000..44e6b965d2a --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=4 +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/espresso-$1\.tar\.gz/ \ + https://github.com/espressomd/espresso/tags .*/v?(\d\S+)\.tar\.gz From 94b0398574f5f289d66caf911c5e84ccf494909d Mon Sep 17 00:00:00 2001 From: Rudolf Weeber Date: Tue, 20 Apr 2021 16:17:39 +0200 Subject: [PATCH 02/37] Debian: relax version dependency for debhelper-compat --- debian/compat | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 debian/compat diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000000..f599e28b8ab --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control index 5464afb7c3b..2e685ab5724 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Espresso Maintainers Build-Depends: cmake, cython3, - debhelper-compat (=13), + debhelper-compat, fftw3-dev, libboost-all-dev, libgsl-dev, From 0f5f1fda7b873a37123d210f002e37eb7e0d9f8e Mon Sep 17 00:00:00 2001 From: Rudolf Weeber Date: Tue, 20 Apr 2021 17:10:15 +0200 Subject: [PATCH 03/37] Debian: Github action to build package --- .github/actions/debian_package/action.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .github/actions/debian_package/action.yml diff --git a/.github/actions/debian_package/action.yml b/.github/actions/debian_package/action.yml new file mode 100644 index 00000000000..f9a29ac5e9e --- /dev/null +++ b/.github/actions/debian_package/action.yml @@ -0,0 +1,8 @@ +name: 'Debian Package' +description: 'Build Debian package' +runs: + using: "docker" + image: "docker://ubuntu:focal" + entrypoint: entrypoint.sh + + From 8369e77d042db656069e6392fdf141650d0d7f39 Mon Sep 17 00:00:00 2001 From: Rudolf Weeber Date: Tue, 20 Apr 2021 17:12:45 +0200 Subject: [PATCH 04/37] Debian: Add package build to workflow --- .github/workflows/push_pull.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/push_pull.yml b/.github/workflows/push_pull.yml index ad816ba714a..d43b666680a 100644 --- a/.github/workflows/push_pull.yml +++ b/.github/workflows/push_pull.yml @@ -55,3 +55,12 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} title: Scheduled CI job has failed body: ${{ env.job_link }} + + debian_package: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@main + - name: Build package + uses: ./.github/actions/debian_package + From 46b39012c828ed52a6bd22adada32a9c531ad6f3 Mon Sep 17 00:00:00 2001 From: Rudolf Weeber Date: Tue, 20 Apr 2021 17:20:03 +0200 Subject: [PATCH 05/37] Debian: Build script --- .github/actions/debian_package/entrypoint.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 .github/actions/debian_package/entrypoint.sh diff --git a/.github/actions/debian_package/entrypoint.sh b/.github/actions/debian_package/entrypoint.sh new file mode 100755 index 00000000000..0dc00324d51 --- /dev/null +++ b/.github/actions/debian_package/entrypoint.sh @@ -0,0 +1,4 @@ +#!/bin/bash +apt build-dep . +dpkg-build-package -uc -us + From db53c69bccb79e8bfa47852e830d3c35388a3257 Mon Sep 17 00:00:00 2001 From: Rudolf Weeber Date: Tue, 20 Apr 2021 17:43:52 +0200 Subject: [PATCH 06/37] Debian: Entrypoint --- .github/actions/debian_package/Dockerfile | 3 +++ .github/actions/debian_package/action.yml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .github/actions/debian_package/Dockerfile diff --git a/.github/actions/debian_package/Dockerfile b/.github/actions/debian_package/Dockerfile new file mode 100644 index 00000000000..3b34b05db29 --- /dev/null +++ b/.github/actions/debian_package/Dockerfile @@ -0,0 +1,3 @@ +FROM ubuntu:focal + +COPY entrypoint.sh /entrypoint.sh diff --git a/.github/actions/debian_package/action.yml b/.github/actions/debian_package/action.yml index f9a29ac5e9e..9d0ba70642c 100644 --- a/.github/actions/debian_package/action.yml +++ b/.github/actions/debian_package/action.yml @@ -2,7 +2,7 @@ name: 'Debian Package' description: 'Build Debian package' runs: using: "docker" - image: "docker://ubuntu:focal" - entrypoint: entrypoint.sh + image: "Dockerfile" + entrypoint: "/entrypoint.sh" From c8ec4cc29f2d4b152c2109bc42fcc540444dfa71 Mon Sep 17 00:00:00 2001 From: Rudolf Weeber Date: Tue, 20 Apr 2021 17:51:43 +0200 Subject: [PATCH 07/37] Debian: Update package cache --- .github/actions/debian_package/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/debian_package/Dockerfile b/.github/actions/debian_package/Dockerfile index 3b34b05db29..147a79d0754 100644 --- a/.github/actions/debian_package/Dockerfile +++ b/.github/actions/debian_package/Dockerfile @@ -1,3 +1,5 @@ FROM ubuntu:focal +run apt update + COPY entrypoint.sh /entrypoint.sh From 97e15bcac4fda8f9978e7546e0f4868924327997 Mon Sep 17 00:00:00 2001 From: Rudolf Weeber Date: Tue, 20 Apr 2021 17:52:48 +0200 Subject: [PATCH 08/37] Debian: apt build-dep non-interactive --- .github/actions/debian_package/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/debian_package/entrypoint.sh b/.github/actions/debian_package/entrypoint.sh index 0dc00324d51..5ee68578674 100755 --- a/.github/actions/debian_package/entrypoint.sh +++ b/.github/actions/debian_package/entrypoint.sh @@ -1,4 +1,4 @@ #!/bin/bash -apt build-dep . +apt build-dep -y . dpkg-build-package -uc -us From cf1fde4c89813df8e5f6234d17f6c48069def93b Mon Sep 17 00:00:00 2001 From: Rudolf Weeber Date: Tue, 20 Apr 2021 18:11:26 +0200 Subject: [PATCH 09/37] Debian: non-interactive --- .github/actions/debian_package/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/debian_package/Dockerfile b/.github/actions/debian_package/Dockerfile index 147a79d0754..c61e3bbd39a 100644 --- a/.github/actions/debian_package/Dockerfile +++ b/.github/actions/debian_package/Dockerfile @@ -1,5 +1,6 @@ FROM ubuntu:focal +ENV DEBIAN_FRONTEND noninteractive run apt update COPY entrypoint.sh /entrypoint.sh From 84db3305ad7fe26aa550c91b9fde2e460a6fbef0 Mon Sep 17 00:00:00 2001 From: Rudolf Weeber Date: Tue, 20 Apr 2021 18:22:30 +0200 Subject: [PATCH 10/37] Debian: Dependencies --- .github/actions/debian_package/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/debian_package/Dockerfile b/.github/actions/debian_package/Dockerfile index c61e3bbd39a..1da3c4ab3d5 100644 --- a/.github/actions/debian_package/Dockerfile +++ b/.github/actions/debian_package/Dockerfile @@ -2,5 +2,6 @@ FROM ubuntu:focal ENV DEBIAN_FRONTEND noninteractive run apt update +run apt install dpkg-dev build-essential COPY entrypoint.sh /entrypoint.sh From c2f80518a16820d8064788c1eded273b0ce281ee Mon Sep 17 00:00:00 2001 From: Rudolf Weeber Date: Tue, 20 Apr 2021 18:26:02 +0200 Subject: [PATCH 11/37] Debian: Noninteractive --- .github/actions/debian_package/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/debian_package/Dockerfile b/.github/actions/debian_package/Dockerfile index 1da3c4ab3d5..f1b1b6e531f 100644 --- a/.github/actions/debian_package/Dockerfile +++ b/.github/actions/debian_package/Dockerfile @@ -2,6 +2,6 @@ FROM ubuntu:focal ENV DEBIAN_FRONTEND noninteractive run apt update -run apt install dpkg-dev build-essential +run apt install -y dpkg-dev build-essential COPY entrypoint.sh /entrypoint.sh From 6ebf5859d7ac59d4446fb991a466a45775e7f06e Mon Sep 17 00:00:00 2001 From: Rudolf Weeber Date: Tue, 20 Apr 2021 18:39:58 +0200 Subject: [PATCH 12/37] Typo --- .github/actions/debian_package/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/debian_package/entrypoint.sh b/.github/actions/debian_package/entrypoint.sh index 5ee68578674..30c6cc77714 100755 --- a/.github/actions/debian_package/entrypoint.sh +++ b/.github/actions/debian_package/entrypoint.sh @@ -1,4 +1,4 @@ #!/bin/bash apt build-dep -y . -dpkg-build-package -uc -us +dpkg-buildpackage -uc -us From 1f2afea4163c9e2f16576372c01e70a6232b1eb4 Mon Sep 17 00:00:00 2001 From: Rudolf Weeber Date: Tue, 20 Apr 2021 18:53:29 +0200 Subject: [PATCH 13/37] iDebian: compat --- debian/compat | 1 - debian/control | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 debian/compat diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28b8ab..00000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 2e685ab5724..432587744ca 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Espresso Maintainers Build-Depends: cmake, cython3, - debhelper-compat, + debhelper-compat (=12), fftw3-dev, libboost-all-dev, libgsl-dev, From 1dea2f12845988d9fb2032e00c842c7df43010d1 Mon Sep 17 00:00:00 2001 From: Rudolf Weeber Date: Tue, 20 Apr 2021 19:19:00 +0200 Subject: [PATCH 14/37] Debian: Build dpendencies --- debian/control | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 432587744ca..3fd068a5fe0 100644 --- a/debian/control +++ b/debian/control @@ -7,11 +7,25 @@ Build-Depends: cython3, debhelper-compat (=12), fftw3-dev, - libboost-all-dev, + libblas-dev, + libboost-dev, + libboost-filesystem-dev, + libboost-mpi-dev, + libboost-serialization-dev, + libboost-test-dev, + libfftw3-dev, libgsl-dev, libhdf5-dev, libhdf5-openmpi-dev, + libhdf5-openmpi-dev, + liblapack-dev, + libpython3-dev, openmpi-common, + python3, + python3-h5py, + python3-numpy, + python3-scipy, + python3-vtk7, Rules-Requires-Root: no Standards-Version: 4.5.0 Vcs-Browser: https://github.com/espressomd/espresso From 8a07c1ecbb240476f74252c95ebe24eac21c08c8 Mon Sep 17 00:00:00 2001 From: Rudolf Weeber Date: Tue, 20 Apr 2021 21:29:16 +0200 Subject: [PATCH 15/37] Debian: ls created image --- .github/actions/debian_package/entrypoint.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/debian_package/entrypoint.sh b/.github/actions/debian_package/entrypoint.sh index 30c6cc77714..306772df17e 100755 --- a/.github/actions/debian_package/entrypoint.sh +++ b/.github/actions/debian_package/entrypoint.sh @@ -1,4 +1,5 @@ #!/bin/bash -apt build-dep -y . -dpkg-buildpackage -uc -us +apt build-dep -y . && +dpkg-buildpackage -uc -us && +ls ~/*.deb From ddeed7c1b652439f0f8200cb2454e933e89e61e1 Mon Sep 17 00:00:00 2001 From: Rudolf Weeber Date: Tue, 20 Apr 2021 21:30:21 +0200 Subject: [PATCH 16/37] Debian: dependencies --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 3fd068a5fe0..f85795666ce 100644 --- a/debian/control +++ b/debian/control @@ -19,6 +19,7 @@ Build-Depends: libhdf5-openmpi-dev, libhdf5-openmpi-dev, liblapack-dev, + python3-dev, libpython3-dev, openmpi-common, python3, From 73ab55a6a90aca9566ef0c9fd13fd947afe3a1f8 Mon Sep 17 00:00:00 2001 From: Rudolf Weeber Date: Wed, 21 Apr 2021 16:01:12 +0200 Subject: [PATCH 17/37] Debian: Test package --- .../Dockerfile | 0 .../actions/build_ubuntu_package/action.yml | 11 +++++++++ .../build_ubuntu_package/entrypoint.sh | 8 +++++++ .github/actions/debian_package/action.yml | 8 ------- .github/actions/debian_package/entrypoint.sh | 5 ---- .../actions/test_ubuntu_package/Dockerfile | 6 +++++ .../actions/test_ubuntu_package/action.yml | 13 +++++++++++ .../actions/test_ubuntu_package/entrypoint.sh | 5 ++++ .../workflows/{push_pull.yml => mac_test.yml} | 8 ------- .github/workflows/packaging.yml | 23 +++++++++++++++++++ debian/control | 13 +++++++++-- 11 files changed, 77 insertions(+), 23 deletions(-) rename .github/actions/{debian_package => build_ubuntu_package}/Dockerfile (100%) create mode 100644 .github/actions/build_ubuntu_package/action.yml create mode 100755 .github/actions/build_ubuntu_package/entrypoint.sh delete mode 100644 .github/actions/debian_package/action.yml delete mode 100755 .github/actions/debian_package/entrypoint.sh create mode 100644 .github/actions/test_ubuntu_package/Dockerfile create mode 100644 .github/actions/test_ubuntu_package/action.yml create mode 100755 .github/actions/test_ubuntu_package/entrypoint.sh rename .github/workflows/{push_pull.yml => mac_test.yml} (89%) create mode 100644 .github/workflows/packaging.yml diff --git a/.github/actions/debian_package/Dockerfile b/.github/actions/build_ubuntu_package/Dockerfile similarity index 100% rename from .github/actions/debian_package/Dockerfile rename to .github/actions/build_ubuntu_package/Dockerfile diff --git a/.github/actions/build_ubuntu_package/action.yml b/.github/actions/build_ubuntu_package/action.yml new file mode 100644 index 00000000000..c2370982161 --- /dev/null +++ b/.github/actions/build_ubuntu_package/action.yml @@ -0,0 +1,11 @@ +name: 'Ubuntu Package' +outputs: + package_file: + description: Name of package file generated +description: 'Build Ubuntu package' +runs: + using: "docker" + image: "Dockerfile" + entrypoint: "/entrypoint.sh" + + diff --git a/.github/actions/build_ubuntu_package/entrypoint.sh b/.github/actions/build_ubuntu_package/entrypoint.sh new file mode 100755 index 00000000000..f2ed2d72bdd --- /dev/null +++ b/.github/actions/build_ubuntu_package/entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/bash +set -e -x -v +apt build-dep -y . && +dpkg-buildpackage -uc -us && +cp ../*.deb /github/workspace && +package_file=`ls /github/workspace/*.deb` +echo "::set-output name=package_file::${package_file}" + diff --git a/.github/actions/debian_package/action.yml b/.github/actions/debian_package/action.yml deleted file mode 100644 index 9d0ba70642c..00000000000 --- a/.github/actions/debian_package/action.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: 'Debian Package' -description: 'Build Debian package' -runs: - using: "docker" - image: "Dockerfile" - entrypoint: "/entrypoint.sh" - - diff --git a/.github/actions/debian_package/entrypoint.sh b/.github/actions/debian_package/entrypoint.sh deleted file mode 100755 index 306772df17e..00000000000 --- a/.github/actions/debian_package/entrypoint.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -apt build-dep -y . && -dpkg-buildpackage -uc -us && -ls ~/*.deb - diff --git a/.github/actions/test_ubuntu_package/Dockerfile b/.github/actions/test_ubuntu_package/Dockerfile new file mode 100644 index 00000000000..c61e3bbd39a --- /dev/null +++ b/.github/actions/test_ubuntu_package/Dockerfile @@ -0,0 +1,6 @@ +FROM ubuntu:focal + +ENV DEBIAN_FRONTEND noninteractive +run apt update + +COPY entrypoint.sh /entrypoint.sh diff --git a/.github/actions/test_ubuntu_package/action.yml b/.github/actions/test_ubuntu_package/action.yml new file mode 100644 index 00000000000..537540e81f1 --- /dev/null +++ b/.github/actions/test_ubuntu_package/action.yml @@ -0,0 +1,13 @@ +name: 'Test Ubuntu Package' +description: 'Test Ubuntu package' +inputs: + package_file: + description: Name of package file to install and test + required: true +runs: + using: "docker" + image: "Dockerfile" + entrypoint: "/entrypoint.sh" + args: + - ${{ inputs.package_file }} + diff --git a/.github/actions/test_ubuntu_package/entrypoint.sh b/.github/actions/test_ubuntu_package/entrypoint.sh new file mode 100755 index 00000000000..1bbe0f27aa8 --- /dev/null +++ b/.github/actions/test_ubuntu_package/entrypoint.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +apt install -y $1 +python3 -c 'import espressomd; system=espressomd.System(box_l=[1,1,1])' + diff --git a/.github/workflows/push_pull.yml b/.github/workflows/mac_test.yml similarity index 89% rename from .github/workflows/push_pull.yml rename to .github/workflows/mac_test.yml index d43b666680a..cb629553941 100644 --- a/.github/workflows/push_pull.yml +++ b/.github/workflows/mac_test.yml @@ -56,11 +56,3 @@ jobs: title: Scheduled CI job has failed body: ${{ env.job_link }} - debian_package: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@main - - name: Build package - uses: ./.github/actions/debian_package - diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml new file mode 100644 index 00000000000..c4e3ebaf5fb --- /dev/null +++ b/.github/workflows/packaging.yml @@ -0,0 +1,23 @@ +name: Build packages + +on: + push: + pull_request: + schedule: + - cron: '0 3 * * *' + +jobs: + ubuntupackage: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@main + - name: Build package + id: build + uses: ./.github/actions/build_ubuntu_package + - name: Test package + uses: ./.github/actions/test_ubuntu_package + with: + package_file: ${{steps.build.outputs.package_file }} + + diff --git a/debian/control b/debian/control index f85795666ce..82f4b08664d 100644 --- a/debian/control +++ b/debian/control @@ -25,8 +25,7 @@ Build-Depends: python3, python3-h5py, python3-numpy, - python3-scipy, - python3-vtk7, + python3-scipy Rules-Requires-Root: no Standards-Version: 4.5.0 Vcs-Browser: https://github.com/espressomd/espresso @@ -42,6 +41,16 @@ Depends: python3-opengl, python3-scipy, python3-vtk7, + libboost-filesystem1.71.0, + libboost-mpi1.71.0, + libboost-serialization1.71.0, + libfftw3-3, + libgsl23, + libhdf5-openmpi-103, + libopenblas0-pthread, + openmpi-bin, + libopenmpi3, + libstdc++6, ${misc:Depends}, Description: Molecular dynamics simulation package ESPResSo is a highly versatile software package for performing From 1320e24b5fa52762e32b04d65cf0c3b01efb92ec Mon Sep 17 00:00:00 2001 From: Bishwash Krishna Parajuli Date: Thu, 2 Feb 2023 13:03:52 +0100 Subject: [PATCH 18/37] fix a missing python3 installation and add get --- .github/actions/test_ubuntu_package/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/test_ubuntu_package/Dockerfile b/.github/actions/test_ubuntu_package/Dockerfile index c61e3bbd39a..9af21572675 100644 --- a/.github/actions/test_ubuntu_package/Dockerfile +++ b/.github/actions/test_ubuntu_package/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal ENV DEBIAN_FRONTEND noninteractive -run apt update +RUN apt-get update && apt-get install -y python3 COPY entrypoint.sh /entrypoint.sh From 293b4936269aa2b307fcb77914802ec893f9ade1 Mon Sep 17 00:00:00 2001 From: Bishwash Krishna Parajuli Date: Thu, 2 Feb 2023 13:22:25 +0100 Subject: [PATCH 19/37] debug and display github/workflow --- .github/actions/test_ubuntu_package/entrypoint.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/test_ubuntu_package/entrypoint.sh b/.github/actions/test_ubuntu_package/entrypoint.sh index 1bbe0f27aa8..2ab1532b4b4 100755 --- a/.github/actions/test_ubuntu_package/entrypoint.sh +++ b/.github/actions/test_ubuntu_package/entrypoint.sh @@ -1,5 +1,6 @@ #!/bin/bash -apt install -y $1 +apt-get install -y $1 +echo $1 +ls -la /github/workspace python3 -c 'import espressomd; system=espressomd.System(box_l=[1,1,1])' - From 2e51a3314654c089fb464df924b3ce7e919881ed Mon Sep 17 00:00:00 2001 From: Bishwash Krishna Parajuli Date: Thu, 2 Feb 2023 13:38:37 +0100 Subject: [PATCH 20/37] ubuntu version update --- .github/actions/build_ubuntu_package/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/build_ubuntu_package/Dockerfile b/.github/actions/build_ubuntu_package/Dockerfile index f1b1b6e531f..7124308ad30 100644 --- a/.github/actions/build_ubuntu_package/Dockerfile +++ b/.github/actions/build_ubuntu_package/Dockerfile @@ -1,7 +1,7 @@ -FROM ubuntu:focal +FROM ubuntu:jammy ENV DEBIAN_FRONTEND noninteractive -run apt update -run apt install -y dpkg-dev build-essential +RUN apt-get update +RUN apt-get install -y dpkg-dev build-essential COPY entrypoint.sh /entrypoint.sh From a1665f16aef9ef57f6def1f404477d99249dd620 Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Thu, 2 Feb 2023 14:45:36 +0100 Subject: [PATCH 21/37] added ppa publish settings on workflow --- .github/workflows/packaging.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index c4e3ebaf5fb..0bfdc731caa 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -19,5 +19,13 @@ jobs: uses: ./.github/actions/test_ubuntu_package with: package_file: ${{steps.build.outputs.package_file }} + + - name: Publish PPA + uses: yuezk/publish-ppa-package@main + with: + repository: 'ppa:bishwash369/espressoppa' + gpg_private_key: ${{ secrets.ESPRESSO_PPA_PRIVATE_KEY }} + gpg_passphrase: ${{ secrets.ESPRESSO_PPA_PASSPHRASE }} + pkgdir: '${{ github.workspace }}' From 27b955f82bbe07e77ae6d0da615d3f410d4b7aee Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Thu, 2 Feb 2023 15:02:41 +0100 Subject: [PATCH 22/37] comment build and test settings in workflow --- .github/workflows/packaging.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 0bfdc731caa..1130dd3301b 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -10,15 +10,15 @@ jobs: ubuntupackage: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@main - - name: Build package - id: build - uses: ./.github/actions/build_ubuntu_package - - name: Test package - uses: ./.github/actions/test_ubuntu_package - with: - package_file: ${{steps.build.outputs.package_file }} + # - name: Checkout + # uses: actions/checkout@main + # - name: Build package + # id: build + # uses: ./.github/actions/build_ubuntu_package + # - name: Test package + # uses: ./.github/actions/test_ubuntu_package + # with: + # package_file: ${{steps.build.outputs.package_file }} - name: Publish PPA uses: yuezk/publish-ppa-package@main From 9a3805ecda9f1c53a4588f306fac4b873b126641 Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Thu, 2 Feb 2023 15:04:53 +0100 Subject: [PATCH 23/37] name: Publish PPAw --- .github/workflows/packaging.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 1130dd3301b..f36df6e3320 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -10,8 +10,8 @@ jobs: ubuntupackage: runs-on: ubuntu-latest steps: - # - name: Checkout - # uses: actions/checkout@main + - name: Checkout + uses: actions/checkout@main # - name: Build package # id: build # uses: ./.github/actions/build_ubuntu_package From dca1adfa78d312177d3b508c1914909d75f151e4 Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Fri, 3 Feb 2023 01:48:30 +0100 Subject: [PATCH 24/37] added yml file for ppa package creation --- .github/workflows/packageppa.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/workflows/packageppa.yml diff --git a/.github/workflows/packageppa.yml b/.github/workflows/packageppa.yml new file mode 100644 index 00000000000..fe8e448f4e0 --- /dev/null +++ b/.github/workflows/packageppa.yml @@ -0,0 +1,7 @@ + name: Publish PPA + uses: yuezk/publish-ppa-package@v1.0.0 + with: + repository: 'ppa:bishwash369/espressoppa' + gpg_private_key: ${{ secrets.ESPRESSO_PPA_PRIVATE_KEY }} + gpg_passphrase: ${{ secrets.ESPRESSO_PPA_PASSPHRASE }} + pkgdir: '${{ github.workspace }}/artifacts/deb-build/globalprotect-openconnect*/' \ No newline at end of file From 08a2a1241f9812e800cd210f5e96807f4aa64438 Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Fri, 3 Feb 2023 01:52:17 +0100 Subject: [PATCH 25/37] changes in packaging yml for pkgdir --- .github/workflows/packageppa.yml | 7 ------- .github/workflows/packaging.yml | 5 +++-- 2 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 .github/workflows/packageppa.yml diff --git a/.github/workflows/packageppa.yml b/.github/workflows/packageppa.yml deleted file mode 100644 index fe8e448f4e0..00000000000 --- a/.github/workflows/packageppa.yml +++ /dev/null @@ -1,7 +0,0 @@ - name: Publish PPA - uses: yuezk/publish-ppa-package@v1.0.0 - with: - repository: 'ppa:bishwash369/espressoppa' - gpg_private_key: ${{ secrets.ESPRESSO_PPA_PRIVATE_KEY }} - gpg_passphrase: ${{ secrets.ESPRESSO_PPA_PASSPHRASE }} - pkgdir: '${{ github.workspace }}/artifacts/deb-build/globalprotect-openconnect*/' \ No newline at end of file diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index f36df6e3320..e4ff300cc4e 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -21,11 +21,12 @@ jobs: # package_file: ${{steps.build.outputs.package_file }} - name: Publish PPA - uses: yuezk/publish-ppa-package@main + uses: yuezk/publish-ppa-package@v1.0.0 with: repository: 'ppa:bishwash369/espressoppa' gpg_private_key: ${{ secrets.ESPRESSO_PPA_PRIVATE_KEY }} gpg_passphrase: ${{ secrets.ESPRESSO_PPA_PASSPHRASE }} - pkgdir: '${{ github.workspace }}' + pkgdir: '${{ github.workspace }}/artifacts/deb-build/globalprotect-openconnect*/' + From dbe4ac825a9ddfe8eacc0e5722d0aa4d16628624 Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Fri, 3 Feb 2023 15:48:27 +0100 Subject: [PATCH 26/37] latest package to publish ppa --- .github/workflows/packaging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index e4ff300cc4e..99c18a2e43b 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -26,7 +26,7 @@ jobs: repository: 'ppa:bishwash369/espressoppa' gpg_private_key: ${{ secrets.ESPRESSO_PPA_PRIVATE_KEY }} gpg_passphrase: ${{ secrets.ESPRESSO_PPA_PASSPHRASE }} - pkgdir: '${{ github.workspace }}/artifacts/deb-build/globalprotect-openconnect*/' + pkgdir: '${{ github.workspace }}' From c7267e7036757ff51b83166819afb43bdd525622 Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Fri, 3 Feb 2023 16:41:15 +0100 Subject: [PATCH 27/37] created a new build run to create an artifact --- .github/workflows/packaging.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 99c18a2e43b..e7758598037 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -12,6 +12,14 @@ jobs: steps: - name: Checkout uses: actions/checkout@main + + - name: Build + run: | + mkdir -p ./artifacts/deb-build + git-archive-all --force-submodules --prefix=espresso-${GITHUB_REF##*/}/ ./artifacts/espresso-${GITHUB_REF##*/}.tar.gz + cd ./artifacts + cp *.tar.gz deb-build && cd deb-build + tar xf *.tar.gz # - name: Build package # id: build # uses: ./.github/actions/build_ubuntu_package @@ -26,7 +34,7 @@ jobs: repository: 'ppa:bishwash369/espressoppa' gpg_private_key: ${{ secrets.ESPRESSO_PPA_PRIVATE_KEY }} gpg_passphrase: ${{ secrets.ESPRESSO_PPA_PASSPHRASE }} - pkgdir: '${{ github.workspace }}' + pkgdir: '${{ github.workspace }}/artifacts/deb-build/espresso*/' From 068797a16eecec8cf0fe6fd7d6e62355dbcfeca0 Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Fri, 3 Feb 2023 16:51:40 +0100 Subject: [PATCH 28/37] replaced git-archive-all with git archive --- .github/workflows/packaging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index e7758598037..a64b921d683 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -16,7 +16,7 @@ jobs: - name: Build run: | mkdir -p ./artifacts/deb-build - git-archive-all --force-submodules --prefix=espresso-${GITHUB_REF##*/}/ ./artifacts/espresso-${GITHUB_REF##*/}.tar.gz + git archive --prefix=espresso-${GITHUB_REF##*/}/ -o ./artifacts/espresso-${GITHUB_REF##*/}.tar.gz HEAD cd ./artifacts cp *.tar.gz deb-build && cd deb-build tar xf *.tar.gz From acb876c4966e729c38b31ad254acd2c9f047021b Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Fri, 3 Feb 2023 17:10:19 +0100 Subject: [PATCH 29/37] importted publish-ppa-package to make changes to it --- .../actions/publish-ppa-package/Dockerfile | 12 +++ .github/actions/publish-ppa-package/LICENSE | 21 ++++++ .../actions/publish-ppa-package/action.yml | 29 +++++++ .github/actions/publish-ppa-package/build.sh | 75 +++++++++++++++++++ .../actions/publish-ppa-package/entrypoint.sh | 5 ++ 5 files changed, 142 insertions(+) create mode 100644 .github/actions/publish-ppa-package/Dockerfile create mode 100644 .github/actions/publish-ppa-package/LICENSE create mode 100644 .github/actions/publish-ppa-package/action.yml create mode 100644 .github/actions/publish-ppa-package/build.sh create mode 100644 .github/actions/publish-ppa-package/entrypoint.sh diff --git a/.github/actions/publish-ppa-package/Dockerfile b/.github/actions/publish-ppa-package/Dockerfile new file mode 100644 index 00000000000..c77ad55f8d7 --- /dev/null +++ b/.github/actions/publish-ppa-package/Dockerfile @@ -0,0 +1,12 @@ +FROM ubuntu:focal + +ENV DEBIAN_FRONTEND noninteractive + +RUN apt-get update && apt-get install -y \ + gpg debmake debhelper devscripts equivs \ + distro-info-data distro-info + +COPY entrypoint.sh /entrypoint.sh +COPY build.sh /build.sh + +ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file diff --git a/.github/actions/publish-ppa-package/LICENSE b/.github/actions/publish-ppa-package/LICENSE new file mode 100644 index 00000000000..cc71c78ef86 --- /dev/null +++ b/.github/actions/publish-ppa-package/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 Kevin Yue + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/.github/actions/publish-ppa-package/action.yml b/.github/actions/publish-ppa-package/action.yml new file mode 100644 index 00000000000..ba3d10f027e --- /dev/null +++ b/.github/actions/publish-ppa-package/action.yml @@ -0,0 +1,29 @@ +name: 'publish-ppa-package' +description: 'Publish a PPA package' +branding: + color: orange + icon: package +inputs: + repository: + description: 'The PPA respository, e.g. ppa:yuezk/globalprotect-openconnect' + required: true + gpg_private_key: + description: 'GPG private key exported as an ASCII armored version or its base64 encoding' + required: true + gpg_passphrase: + description: 'Passphrase of the GPG private key' + required: false + pkgdir: + description: 'The package directory which contains the debian folder' + required: true + series: + description: 'The series to which the package will be published, separated by space. e.g., "bionic focal"' + required: false + is_native: + description: 'Indicates whether it is a native debian package or not' + required: false + default: '' + +runs: + using: docker + image: Dockerfile \ No newline at end of file diff --git a/.github/actions/publish-ppa-package/build.sh b/.github/actions/publish-ppa-package/build.sh new file mode 100644 index 00000000000..ef0ea26b9f0 --- /dev/null +++ b/.github/actions/publish-ppa-package/build.sh @@ -0,0 +1,75 @@ +#!/bin/bash + +set -o errexit -o pipefail -o nounset + +REPOSITORY=$INPUT_REPOSITORY +GPG_PRIVATE_KEY="$INPUT_GPG_PRIVATE_KEY" +GPG_PASSPHRASE=$INPUT_GPG_PASSPHRASE +PKGDIR=$INPUT_PKGDIR +IS_NATIVE=$INPUT_IS_NATIVE +SERIES=$INPUT_SERIES + +assert_non_empty() { + name=$1 + value=$2 + if [[ -z "$value" ]]; then + echo "::error::Invalid Value: $name is empty." >&2 + exit 1 + fi +} + +assert_non_empty inputs.repository "$REPOSITORY" +assert_non_empty inputs.gpg_private_key "$GPG_PRIVATE_KEY" +assert_non_empty inputs.gpg_passphrase "$GPG_PASSPHRASE" +assert_non_empty inputs.pkgdir "$PKGDIR" + +if [[ -z "$SERIES" ]]; then + SERIES=$(distro-info --supported) +fi + +echo "::group::Importing GPG private key..." +GPG_KEY_ID=$(echo "$GPG_PRIVATE_KEY" | gpg --import-options show-only --import | sed -n '2s/^\s*//p') +echo $GPG_KEY_ID +echo "$GPG_PRIVATE_KEY" | gpg --batch --passphrase "$GPG_PASSPHRASE" --import +echo "::endgroup::" + +for s in $SERIES; do + ubuntu_version=$(distro-info --series $s -r) + version="${ubuntu_version:0:5}" + + echo "::group::Building deb for: $version ($s)" + + cd $PKGDIR + if [[ -z "$IS_NATIVE" ]]; then + format_file="debian/source/format" + if [[ ! -f "$format_file" ]] || grep -q "native" "$format_file"; then + IS_NATIVE="true" + fi + fi + + if [[ "$IS_NATIVE" == "true" ]]; then + echo "Making native package..." + debmake -n + else + echo "Making non-native package..." + debmake + fi + + mk-build-deps --install --remove --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control + + sed -i"" -re "s/\s\w+;/ $s;/" -re "s/\((.+)-.+\)/(\1-ppa1~ubuntu${version})/" debian/changelog + + if [[ "$IS_NATIVE" == "true" ]]; then + echo "y" | debuild -S -sa \ + -k"$GPG_KEY_ID" \ + -p"gpg --batch --passphrase "$GPG_PASSPHRASE" --pinentry-mode loopback" + else + debuild -S -sa \ + -k"$GPG_KEY_ID" \ + -p"gpg --batch --passphrase "$GPG_PASSPHRASE" --pinentry-mode loopback" + fi + dput $REPOSITORY ../*.changes + + rm -rf ../*.{changes,build,buildinfo,deb,ddeb,dsc} + echo "::endgroup::" +done \ No newline at end of file diff --git a/.github/actions/publish-ppa-package/entrypoint.sh b/.github/actions/publish-ppa-package/entrypoint.sh new file mode 100644 index 00000000000..db38a13975d --- /dev/null +++ b/.github/actions/publish-ppa-package/entrypoint.sh @@ -0,0 +1,5 @@ +#!/bin/bash -l + +set -o errexit -o pipefail -o nounset + +/build.sh \ No newline at end of file From c16aa8034a45f6c8b3339c3e2dd748ef17e3e656 Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Fri, 3 Feb 2023 17:15:12 +0100 Subject: [PATCH 30/37] modified settings in the ppa-package --- .github/actions/publish-ppa-package/Dockerfile | 2 +- .github/actions/publish-ppa-package/build.sh | 4 ++-- .github/workflows/packaging.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/publish-ppa-package/Dockerfile b/.github/actions/publish-ppa-package/Dockerfile index c77ad55f8d7..beca92820b9 100644 --- a/.github/actions/publish-ppa-package/Dockerfile +++ b/.github/actions/publish-ppa-package/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal +FROM ubuntu:jammy ENV DEBIAN_FRONTEND noninteractive diff --git a/.github/actions/publish-ppa-package/build.sh b/.github/actions/publish-ppa-package/build.sh index ef0ea26b9f0..a0590d01e04 100644 --- a/.github/actions/publish-ppa-package/build.sh +++ b/.github/actions/publish-ppa-package/build.sh @@ -49,10 +49,10 @@ for s in $SERIES; do if [[ "$IS_NATIVE" == "true" ]]; then echo "Making native package..." - debmake -n + debmake -n -y else echo "Making non-native package..." - debmake + debmake -y fi mk-build-deps --install --remove --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index a64b921d683..43871e22a8e 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -29,7 +29,7 @@ jobs: # package_file: ${{steps.build.outputs.package_file }} - name: Publish PPA - uses: yuezk/publish-ppa-package@v1.0.0 + uses: ./.github/actions/publish-ppa-package with: repository: 'ppa:bishwash369/espressoppa' gpg_private_key: ${{ secrets.ESPRESSO_PPA_PRIVATE_KEY }} From 3f547a3ea9cc62c2f33f35da9be2ee5e35ea54fe Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Fri, 3 Feb 2023 17:27:02 +0100 Subject: [PATCH 31/37] modified .sh files with git update-index command --- .github/actions/publish-ppa-package/build.sh | 0 .github/actions/publish-ppa-package/entrypoint.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .github/actions/publish-ppa-package/build.sh mode change 100644 => 100755 .github/actions/publish-ppa-package/entrypoint.sh diff --git a/.github/actions/publish-ppa-package/build.sh b/.github/actions/publish-ppa-package/build.sh old mode 100644 new mode 100755 diff --git a/.github/actions/publish-ppa-package/entrypoint.sh b/.github/actions/publish-ppa-package/entrypoint.sh old mode 100644 new mode 100755 From 1e4bf484a1312abbaa15f5fc5085e1bfd406e685 Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Fri, 3 Feb 2023 17:31:43 +0100 Subject: [PATCH 32/37] work in progress- hardcoded package version --- .github/workflows/packaging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 43871e22a8e..7f37c531038 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -16,7 +16,7 @@ jobs: - name: Build run: | mkdir -p ./artifacts/deb-build - git archive --prefix=espresso-${GITHUB_REF##*/}/ -o ./artifacts/espresso-${GITHUB_REF##*/}.tar.gz HEAD + git archive --prefix=espresso-4.2/ -o ./artifacts/espresso-4.2.tar.gz HEAD cd ./artifacts cp *.tar.gz deb-build && cd deb-build tar xf *.tar.gz From 13b0774f542becd953a456fd3ad006e443e05879 Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Fri, 3 Feb 2023 18:29:42 +0100 Subject: [PATCH 33/37] change log file edited --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1fd4b5da0ce..b0342428693 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +espresso (4.2-rc1) unstable; urgency=medium + + * Initial release + + -- Bishwash Krishna Parajuli Fri, 02 Feb 2023 18:28:23 +0100 + + espresso (4.1.5~rc1) unstable; urgency=medium * Initial release From 46041c02cb9a04683bdb171e54eb622fe58db108 Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Fri, 3 Feb 2023 18:50:50 +0100 Subject: [PATCH 34/37] modification of control: cmake version, and version updated in changelog --- debian/changelog | 4 ++-- debian/control | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b0342428693..8aa5a5bcae3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -espresso (4.2-rc1) unstable; urgency=medium +espresso (4.2.1-rc1) unstable; urgency=medium * Initial release - -- Bishwash Krishna Parajuli Fri, 02 Feb 2023 18:28:23 +0100 + -- Bishwash Krishna Parajuli Fri, 03 Feb 2023 18:28:23 +0100 espresso (4.1.5~rc1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 82f4b08664d..e2e9cf156a8 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: science Priority: optional Maintainer: Espresso Maintainers Build-Depends: - cmake, + cmake (=3.18), cython3, debhelper-compat (=12), fftw3-dev, From e0dc48eedf54513c00ef6e24e060e1813cf091f1 Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Fri, 3 Feb 2023 18:59:41 +0100 Subject: [PATCH 35/37] modification of control file for versions of libraries --- debian/changelog | 2 +- debian/control | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8aa5a5bcae3..9fe0358cf4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ espresso (4.2.1-rc1) unstable; urgency=medium * Initial release - -- Bishwash Krishna Parajuli Fri, 03 Feb 2023 18:28:23 +0100 + -- Bishwash Krishna Parajuli Fri, 03 Feb 2023 18:57:28 +0100 espresso (4.1.5~rc1) unstable; urgency=medium diff --git a/debian/control b/debian/control index e2e9cf156a8..684388ed71b 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,9 @@ Section: science Priority: optional Maintainer: Espresso Maintainers Build-Depends: - cmake (=3.18), + cmake (>= 3.18), cython3, - debhelper-compat (=12), + debhelper-compat (>= 12), fftw3-dev, libblas-dev, libboost-dev, From 9ade7d3b0ad588926a38c284a5b461cc398a9d50 Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Fri, 3 Feb 2023 19:08:36 +0100 Subject: [PATCH 36/37] version change for dbhelper-compat in control file --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 684388ed71b..8756fbeec49 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Espresso Maintainers Build-Depends: cmake (>= 3.18), cython3, - debhelper-compat (>= 12), + debhelper-compat (= 12), fftw3-dev, libblas-dev, libboost-dev, From 9d90c68d5a98f38d07d0da953e44980f250919f6 Mon Sep 17 00:00:00 2001 From: bishwash369 Date: Mon, 6 Feb 2023 17:51:46 +0100 Subject: [PATCH 37/37] test commit for actions --- .github/workflows/packaging.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 7f37c531038..833fd7beb1d 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -16,7 +16,7 @@ jobs: - name: Build run: | mkdir -p ./artifacts/deb-build - git archive --prefix=espresso-4.2/ -o ./artifacts/espresso-4.2.tar.gz HEAD + git archive --prefix=espresso-espresso-4.2/ -o ./artifacts/espresso-4.2.tar.gz HEAD cd ./artifacts cp *.tar.gz deb-build && cd deb-build tar xf *.tar.gz @@ -26,7 +26,7 @@ jobs: # - name: Test package # uses: ./.github/actions/test_ubuntu_package # with: - # package_file: ${{steps.build.outputs.package_file }} + ## package_file: ${{steps.build.outputs.package_file }} - name: Publish PPA uses: ./.github/actions/publish-ppa-package