gplugin/gplugin

Merged in feature/more-convey-cleanups (pull request #68)
develop
2020-02-27, Gary Kramlich
0c43b486bb14
Parents ca39d0ed5263a57a38c8c4d5
Children 47b11278e9ea
Merged in feature/more-convey-cleanups (pull request #68)

Feature/more convey cleanups

Approved-by: Elliott Sales de Andrade
3 files changed, 46 insertions(+), 49 deletions(-)
  • +43 -47
    convey.yml
  • +1 -1
    packaging/debian/control
  • +2 -1
    packaging/mingw-cross/PKGBUILD
    • --- a/convey.yml Wed Feb 26 21:09:37 2020 +0000
    +++ b/convey.yml Thu Feb 27 05:38:16 2020 +0000
    @@ -6,8 +6,7 @@
    - REGISTRY=docker.io
    - REGISTRY_USERNAME
    - REGISTRY_PASSWORD
    - - CLANG_FORMAT_BUILD_IMAGE=${REGISTRY}/${REPOSITORY}:debian-buster-amd64
    - - DOCS_BUILD_IMAGE=${REGISTRY}/${REPOSITORY}:debian-buster-amd64
    + - DOCS_BUILD_IMAGE=${REGISTRY}/${REPOSITORY}:debian-bullseye-amd64
    - DOCS_VERSION=latest
    tasks:
    @@ -16,22 +15,22 @@
    files:
    - alpine-edge-amd64
    - debian-bullseye-amd64
    - - debian-buster-amd64
    + - debian-bullseye-arm64
    + - debian-bullseye-armhf
    - dist
    - - docs
    - elementary-juno-amd64
    - - fedora-29-amd64
    - fedora-30-amd64
    - fedora-31-amd64
    + - fedora-32-amd64
    - fedora-rawhide-amd64
    + - i18n
    - mingw-w64-i686
    - mingw-w64-x86_64
    - opensuse-tumbleweed-amd64
    - pvs-studio
    - scanbuild
    - - ubuntu-bionic-amd64
    - - ubuntu-cosmic-amd64
    - - ubuntu-disco-amd64
    + - ubuntu-focal-amd64
    + - valgrind
    import:
    type: docker/import
    @@ -122,13 +121,16 @@
    stages:
    - tasks: [import, build-target]
    - debian-buster-amd64:
    - environment: [DISTRO=debian, VERSION=buster]
    + debian-bullseye-amd64:
    + environment: [DISTRO=debian, VERSION=bullseye]
    stages:
    - tasks: [import, build, export]
    -
    - debian-bullseye-amd64:
    - environment: [DISTRO=debian, VERSION=bullseye]
    + debian-bullseye-arm64:
    + environment: [DISTRO=debian, VERSION=bullseye, ARCH=arm64]
    + stages:
    + - tasks: [import, build, export]
    + debian-bullseye-armhf:
    + environment: [DISTRO=debian, VERSION=bullseye, ARCH=armhf]
    stages:
    - tasks: [import, build, export]
    @@ -142,10 +144,6 @@
    stages:
    - tasks: [import, build, export]
    - fedora-29-amd64:
    - environment: [DISTRO=fedora, VERSION=29]
    - stages:
    - - tasks: [import, build, export]
    fedora-30-amd64:
    environment: [DISTRO=fedora, VERSION=30]
    stages:
    @@ -154,6 +152,10 @@
    environment: [DISTRO=fedora, VERSION=31]
    stages:
    - tasks: [import, build, export]
    + fedora-32-amd64:
    + environment: [DISTRO=fedora, VERSION=32]
    + stages:
    + - tasks: [import, build, export]
    fedora-rawhide-amd64:
    environment: [DISTRO=fedora, VERSION=rawhide]
    stages:
    @@ -183,6 +185,11 @@
    - tasks: [logout]
    run: always
    + i18n:
    + environment: [TARGET=i18n]
    + stages:
    + - tasks: [import, build-target, export-target]
    +
    mingw-w64-i686:
    environment: [DISTRO=mingw, VERSION=w64, ARCH=i686, PKGBUILD_DIR=mingw-cross]
    stages:
    @@ -219,16 +226,8 @@
    stages:
    - tasks: [import, build-target]
    - ubuntu-bionic-amd64:
    - environment: [DISTRO=ubuntu, VERSION=bionic]
    - stages:
    - - tasks: [import, build, export]
    - ubuntu-cosmic-amd64:
    - environment: [DISTRO=ubuntu, VERSION=cosmic]
    - stages:
    - - tasks: [import, build, export]
    - ubuntu-disco-amd64:
    - environment: [DISTRO=ubuntu, VERSION=disco]
    + ubuntu-focal-amd64:
    + environment: [DISTRO=ubuntu, VERSION=focal]
    stages:
    - tasks: [import, build, export]
    @@ -242,10 +241,6 @@
    publish:
    stages:
    - environment:
    - - DISTRO=debian
    - - VERSION=buster
    - tasks: [import-artifacts, publish-deb, publish-debsrc]
    - - environment:
    - DISTRO=elementary
    - VERSION=juno
    tasks: [import-artifacts, publish-deb, publish-debsrc]
    @@ -259,15 +254,7 @@
    tasks: [import-artifacts, publish-rpm]
    - environment:
    - DISTRO=ubuntu
    - - VERSION=bionic
    - tasks: [import-artifacts, publish-deb, publish-debsrc]
    - - environment:
    - - DISTRO=ubuntu
    - - VERSION=cosmic
    - tasks: [import-artifacts, publish-deb, publish-debsrc]
    - - environment:
    - - DISTRO=ubuntu
    - - VERSION=disco
    + - VERSION=focal
    tasks: [import-artifacts, publish-deb, publish-debsrc]
    meta-plans:
    @@ -275,16 +262,25 @@
    plans:
    - alpine-edge-amd64
    - debian-bullseye-amd64
    - - debian-buster-amd64
    - dist
    - - docs
    - - elementary-juno-amd64
    - - fedora-29-amd64
    - fedora-30-amd64
    + - fedora-31-amd64
    + - fedora-32-amd64
    + - fedora-rawhide-amd64
    + - mingw-w64-i686
    + - mingw-w64-x86_64
    - opensuse-tumbleweed-amd64
    + - ubuntu-focal-amd64
    + tools:
    + plans:
    + - clang-format
    + - i18n
    - pvs-studio
    - scanbuild
    - - ubuntu-bionic-amd64
    - - ubuntu-cosmic-amd64
    - - ubuntu-disco-amd64
    + - valgrind
    + - simple
    + qemu-user-static:
    + plans:
    + - debian-bullseye-arm64
    + - debian-bullseye-armhf
    --- a/packaging/debian/control Wed Feb 26 21:09:37 2020 +0000
    +++ b/packaging/debian/control Thu Feb 27 05:38:16 2020 +0000
    @@ -6,7 +6,7 @@
    meson (>=0.37.0), libglib2.0-dev, libgtk-3-dev,
    gettext, help2man,
    gobject-introspection, libgirepository1.0-dev,
    - liblua5.1-0-dev, lua-lgi,
    + liblua5.3-dev, lua-lgi,
    python3-dev, python-gi-dev, python3-gi,
    valac
    Homepage: https://bitbucket.org/gplugin/gplugin
    --- a/packaging/mingw-cross/PKGBUILD Wed Feb 26 21:09:37 2020 +0000
    +++ b/packaging/mingw-cross/PKGBUILD Thu Feb 27 05:38:16 2020 +0000
    @@ -26,7 +26,8 @@
    --cross-file=${MINGW_PACKAGE_PREFIX}.txt \
    -Ddoc=false\
    -Dlua=false \
    - -Dpython=false \
    + -Dperl=false \
    + -Dpython3=false \
    -Dgobject-introspection=false \
    -Dvapi=false \
    -Dhelp2man=false \