Update all the things and remove all the things that are old and broke
--- a/Dockerfile.coverity Thu Jan 24 02:59:55 2019 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-FROM gplugin/builder:debian-stretch-amd64
-ENV COVERITY_VERSION=2017.07
-ENV PATH=/cov-analysis-linux64-${COVERITY_VERSION}/bin:$PATH
-ENV ARTIFACTS_DIR=coverity/
-ADD coverity/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz /
-COPY coverity/build.sh /
--- a/Dockerfile.debian-stretch-amd64 Thu Jan 24 02:59:55 2019 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
-COPY debian/localepurge.selections /
- debconf-set-selections -v /localepurge.selections && \
- apt-get install -y --no-install-recommends localepurge && \
- rm -rf /var/lib/apt/lists
- echo deb http://ftp.debian.org/debian stretch-backports main > /etc/apt/sources.list.d/backports.list && \
- apt-get install -y --no-install-recommends \
- ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
- build-essential meson/stretch-backports gettext help2man xsltproc mercurial \
- libglib2.0-dev gobject-introspection libgirepository1.0-dev \
- gtk-doc-tools libgtk-3-dev libgladeui-dev \
- python3-dev python-gi-dev python3-gi \
- liblua5.1-0-dev lua-lgi luarocks \
- rm -rf /var/lib/apt/lists
- luarocks install moonscript
-COPY debian/build.sh /build.sh
--- a/Dockerfile.fedora-28-amd64 Thu Jan 24 02:59:55 2019 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
- meson ninja-build gcc mercurial \
- redhat-rpm-config rpm-build \
- help2man libxslt gettext \
- glib2-devel gobject-introspection-devel \
- gtk3-devel gtk-doc glade-devel \
- lua-devel lua-lgi lua-lpeg luarocks lua-moonscript \
- python3-devel pygobject3-devel python3-gobject
-ENV DISTRIBUTION=fedora \
-COPY rpm/build.sh /build.sh
--- a/Dockerfile.fedora-29-amd64 Thu Jan 24 02:59:55 2019 -0600
+++ b/Dockerfile.fedora-29-amd64 Tue Jun 18 22:46:59 2019 -0500
@@ -4,18 +4,22 @@
- meson ninja-build gcc mercurial \
+ meson ninja-build gcc \ redhat-rpm-config rpm-build \
+ python python-devel python-pip \ help2man libxslt gettext \
glib2-devel gobject-introspection-devel \
gtk3-devel gtk-doc glade-devel \
lua-devel lua-lgi lua-lpeg luarocks lua-moonscript \
python3-devel pygobject3-devel python3-gobject
ENV DISTRIBUTION=fedora \
COPY rpm/build.sh /build.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dockerfile.fedora-30-amd64 Tue Jun 18 22:46:59 2019 -0500
@@ -0,0 +1,21 @@
+MAINTAINER Gary Kramlich <grim@reaperworld.com> + meson ninja-build gcc mercurial \ + redhat-rpm-config rpm-build \ + help2man libxslt gettext \ + glib2-devel gobject-introspection-devel \ + gtk3-devel gtk-doc glade-devel \ + lua-devel lua-lgi lua-lpeg luarocks lua-moonscript \ + python3-devel pygobject3-devel python3-gobject +ENV DISTRIBUTION=fedora \ +COPY rpm/build.sh /build.sh --- a/Dockerfile.mingw-w64-i686 Thu Jan 24 02:59:55 2019 -0600
+++ b/Dockerfile.mingw-w64-i686 Tue Jun 18 22:46:59 2019 -0500
@@ -1,21 +1,9 @@
-# vi:et:ts=4 sw=4 sts=4:ft=Dockerfile
-FROM rwgrim/msys2-cross as deps
- pacman-cross -Syy --noconfirm \
- mingw32/mingw-w64-i686-gobject-introspection \
- mingw32/mingw-w64-i686-gobject-introspection-runtime \
- mingw32/mingw-w64-i686-glib2 \
- mingw32/mingw-w64-i686-gtk3 \
- mingw32/mingw-w64-i686-python3 \
- mingw32/mingw-w64-i686-pygobject-devel \
- mingw32/mingw-w64-i686-lua51 \
- mingw32/mingw-w64-i686-lua51-lgi
+# vi:et:ts=4 sw=4 sts=4:ft=dockerfile MAINTAINER Gary Kramlich <grim@reaperworld.com>
dpkg --add-architecture i386 && \
@@ -29,17 +17,21 @@
rm -rf /var/lib/apt/lists
+# install our target dependencies + pacman-cross -Syy --noconfirm \ + mingw32/mingw-w64-i686-gobject-introspection \ + mingw32/mingw-w64-i686-gobject-introspection-runtime \ + mingw32/mingw-w64-i686-glib2 \ + mingw32/mingw-w64-i686-gtk3 \ + mingw32/mingw-w64-i686-python3 \ + mingw32/mingw-w64-i686-pygobject-devel \ + mingw32/mingw-w64-i686-lua51 \ + mingw32/mingw-w64-i686-lua51-lgi -COPY --from=deps /windows /windows
-COPY mingw/mingw-w64-i686.txt /windows/
-COPY mingw/mingw-w64-i686-pkg-config \
-ENV ARCH=i686 PREFIX=mingw32
+ENV MINGW_DISTRO=mingw-w64-i686 PREFIX=/mingw32 CROSS_FILE=mingw-w64-i686 --- a/Dockerfile.mingw-w64-x86_64 Thu Jan 24 02:59:55 2019 -0600
+++ b/Dockerfile.mingw-w64-x86_64 Tue Jun 18 22:46:59 2019 -0500
@@ -1,32 +1,36 @@
+# vi:et:ts=4 sw=4 sts=4:ft=dockerfile MAINTAINER Gary Kramlich <grim@reaperworld.com>
apt-get install -y --no-install-recommends \
- wget xz-utils zip gettext \
- cmake mercurial ca-certificates make \
- mingw-w64 mingw-w64-i686-dev mingw-w64-tools \
- libsafe-isa-perl libglib2.0-dev gobject-introspection \
- gnupg gnupg-curl nsis \
+ ca-certificates build-essential gettext xz-utils pkg-config zip \ + mingw-w64 mingw-w64-x86-64-dev mingw-w64-tools \ + mercurial meson ninja-build help2man \ + wine wine64 xauth xvfb \ + libglib2.0-dev gobject-introspection \ rm -rf /var/lib/apt/lists
+# install our target dependencies + pacman-cross -Syy --noconfirm \ + mingw64/mingw-w64-x86_64-gobject-introspection \ + mingw64/mingw-w64-x86_64-gobject-introspection-runtime \ + mingw64/mingw-w64-x86_64-glib2 \ + mingw64/mingw-w64-x86_64-gtk3 \ + mingw64/mingw-w64-x86_64-python3 \ + mingw64/mingw-w64-x86_64-pygobject-devel \ + mingw64/mingw-w64-x86_64-lua51 \ + mingw64/mingw-w64-x86_64-lua51-lgi -COPY mingw/toolchain.cmake.in \
- mingw/dependencies.in \
-ENV ARCH=x86_64 PREFIX=mingw64
- cat /toolchain.cmake.in | envsubst > /toolchain.cmake && \
+ENV MINGW_DISTRO=mingw-w64-x86_64 PREFIX=/mingw32 CROSS_FILE=mingw-w64-x86_64
--- a/Dockerfile.opensuse-tumbleweed-amd64 Thu Jan 24 02:59:55 2019 -0600
+++ b/Dockerfile.opensuse-tumbleweed-amd64 Tue Jun 18 22:46:59 2019 -0500
@@ -1,4 +1,4 @@
-FROM opensuse:tumbleweed
+FROM opensuse/tumbleweed:latest MAINTAINER Gary Kramlich <grim@reaperworld.com>
@@ -23,3 +23,4 @@
COPY rpm/build.sh /build.sh
--- a/Dockerfile.osxcross-10.8-x86_64 Thu Jan 24 02:59:55 2019 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
- apt-get install -y --no-install-recommends \
- cmake help2man libglib2.0-dev mercurial pkg-config unzip xsltproc \
- gobject-introspection libgirepository1.0-dev \
- rm -rf /var/lib/apt/lists
- MACOSX_DEPLOYMENT_TARGET=10.8 osxcross-macports install glib2 gtk3 gobject-introspection && \
- ln -sf /opt/osxcross/target/macports/pkgs/opt/local /opt/local
--- a/Dockerfile.pvs-studio Thu Jan 24 02:59:55 2019 -0600
+++ b/Dockerfile.pvs-studio Tue Jun 18 22:46:59 2019 -0500
@@ -1,6 +1,6 @@
FROM gplugin/builders:debian-buster-amd64
-ENV PVS_STUDIO_DOWNLOAD_URL=http://files.viva64.com/pvs-studio-7.00.29701.851-amd64.deb
+ENV PVS_STUDIO_DOWNLOAD_URL=http://files.viva64.com/pvs-studio-7.02.31917.1198-amd64.deb MAINTAINER Gary Kramlich <grim@reaperworld.com>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dockerfile.ubuntu-cosmic-amd64 Tue Jun 18 22:46:59 2019 -0500
@@ -0,0 +1,37 @@
+MAINTAINER Gary Kramlich <grim@reaperworld.com> +COPY debian/localepurge.selections / + debconf-set-selections -v /localepurge.selections && \ + apt-get install -y --no-install-recommends localepurge && \ + rm -rf /var/lib/apt/lists + apt-get install -y --no-install-recommends \ + ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \ + build-essential ninja-build gettext help2man xsltproc mercurial meson \ + libglib2.0-dev gobject-introspection libgirepository1.0-dev \ + gtk-doc-tools libgtk-3-dev libgladeui-dev \ + python3-dev python-gi-dev python3-gi \ + liblua5.1-0-dev lua-lgi luarocks \ + rm -rf /var/lib/apt/lists + luarocks install moonscript +COPY debian/build.sh /build.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dockerfile.ubuntu-disco-amd64 Tue Jun 18 22:46:59 2019 -0500
@@ -0,0 +1,35 @@
+MAINTAINER Gary Kramlich <grim@reaperworld.com> +COPY debian/localepurge.selections / + debconf-set-selections -v /localepurge.selections && \ + apt-get install -y --no-install-recommends localepurge && \ + rm -rf /var/lib/apt/lists + apt-get install -y --no-install-recommends \ + ca-certificates unzip devscripts fakeroot debhelper \ + build-essential meson gettext help2man xsltproc mercurial \ + libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev \ + python3-dev python-gi-dev python3-gi \ + liblua5.1-0-dev lua-lgi luarocks \ + rm -rf /var/lib/apt/lists + luarocks install moonscript +ENV DISTRIBUTION=disco \ +COPY debian/build.sh /build.sh --- a/Dockerfile.ubuntu-xenial-amd64 Thu Jan 24 02:59:55 2019 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
-COPY debian/localepurge.selections /
- debconf-set-selections -v /localepurge.selections && \
- apt-get install -y --no-install-recommends localepurge && \
- rm -rf /var/lib/apt/lists
- apt-get install -y --no-install-recommends \
- ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
- build-essential ninja-build gettext help2man xsltproc mercurial \
- libglib2.0-dev gobject-introspection libgirepository1.0-dev \
- gtk-doc-tools libgtk-3-dev libgladeui-dev \
- python3-dev python-gi-dev python3-gi \
- liblua5.1-0-dev lua-lgi luarocks \
- rm -rf /var/lib/apt/lists
- apt-get install -y --no-install-recommends python3-setuptools python3-pip && \
- pip3 install meson && \
- rm -rf /var/lib/apt/lists
- luarocks install moonscript
-COPY debian/build.sh /build.sh
--- a/Dockerfile.ubuntu-zesty-amd64 Thu Jan 24 02:59:55 2019 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
-COPY debian/localepurge.selections /
- debconf-set-selections -v /localepurge.selections && \
- apt-get install -y --no-install-recommends localepurge && \
- rm -rf /var/lib/apt/lists
- apt-get install -y --no-install-recommends \
- ca-certificates unzip devscripts fakeroot debhelper \
- build-essential meson gettext help2man xsltproc mercurial \
- libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev \
- python3-dev python-gi-dev python3-gi \
- liblua5.1-0-dev lua-lgi luarocks \
- rm -rf /var/lib/apt/lists
- luarocks install moonscript
-ENV DISTRIBUTION=zesty \
-COPY debian/build.sh /build.sh
--- a/convey.yml Thu Jan 24 02:59:55 2019 -0600
+++ b/convey.yml Tue Jun 18 22:46:59 2019 -0500
@@ -1,6 +1,10 @@
@@ -11,56 +15,46 @@
- - ${REPO}:alpine-edge-amd64
- - ${REPO}:debian-stretch-amd64
- - ${REPO}:debian-buster-amd64
- - ${REPO}:fedora-28-amd64
- - ${REPO}:fedora-29-amd64
- - ${REPO}:opensuse-tumbleweed-amd64
- - ${REPO}:ubuntu-bionic-amd64
+ - ${REGSITRY}/${REPO}:alpine-edge-amd64 + - ${REGISTRY}/${REPO}:coverity + - ${REGISTRY}/${REPO}:debian-stretch-amd64 + - ${REGISTRY}/${REPO}:debian-buster-amd64 + - ${REGISTRY}/${REPO}:fedora-28-amd64 + - ${REGISTRY}/${REPO}:fedora-29-amd64 + - ${REGISTRY}/${REPO}:opensuse-tumbleweed-amd64 + - ${REGISTRY}/${REPO}:ubuntu-bionic-amd64 dockerfile: Dockerfile.${DISTRO}-${VERSION}-${ARCH}
- tag: ${REPO}:${DISTRO}-${VERSION}-${ARCH}
+ tag: ${REGISTRY}/${REPO}:${DISTRO}-${VERSION}-${ARCH}
- username: ${DOCKERHUB_USERNAME}
- password: ${DOCKERHUB_PASSWORD}
- image: ${REPO}:${DISTRO}-${VERSION}-${ARCH}
+ image: ${REGISTRY}/${REPO}:${DISTRO}-${VERSION}-${ARCH}
- dockerfile: Dockerfile.pvs-studio
- tag: ${REPO}:pvs-studio
- image: ${REPO}:pvs-studio
dockerfile: Dockerfile.${TARGET}
- tags: ${REPO}:${TARGET}
+ tags: ${REGISTRY}/${REPO}:${TARGET}
- image: ${REPO}:${TARGET}
+ image: ${REGISTRY}/${REPO}:${TARGET} + username: ${REGISTRY_USERNAME} + password: ${REGISTRY_PASSWORD} # stuff after this needs work yet
@@ -95,25 +89,33 @@
+ - tasks: [import, build-target] environment: [DOCKERHUB_USERNAME, DOCKERHUB_PASSWORD]
- tasks: [login, publish]
+ environment: [REGISTRY, REGISTRY_USERNAME, REGISTRY_PASSWORD] + - tasks: [login, publish-target] environment: [DISTRO=alpine, VERSION=edge, FILES=alpine]
- environment: [DISTRO=debian, VERSION=stretch, FILES=debian]
- - tasks: [import, build]
environment: [DISTRO=debian, VERSION=buster, FILES=debian]
@@ -122,121 +124,60 @@
environment: [TARGET=dist, FILES=dist]
- - tasks: [import, simple-build]
- environment: [DOCKERHUB_USERNAME, DOCKERHUB_PASSWORD, TARGET=dist]
- - tasks: [login, simple-push]
+ - tasks: [import, build-target] environment: [TARGET=docs, FILES=docs]
- - tasks: [import, simple-build]
- environment: [DOCKERHUB_USERNAME, DOCKERHUB_PASSWORD, TARGET=docs]
- - tasks: [login, simple-push]
- environment: [DISTRO=fedora, VERSION=28, FILES=rpm]
- - tasks: [import, build]
+ - tasks: [import, build-target] environment: [DISTRO=fedora, VERSION=29, FILES=rpm]
+ environment: [DISTRO=fedora, VERSION=30, FILES=rpm] + - tasks: [import, build] environment: [DISTRO=mingw, VERSION=w64, ARCH=i686, FILES=mingw]
+ environment: [DISTRO=mingw, VERSION=w64, ARCH=x86_64, FILES=mingw] + - tasks: [import, build] opensuse-tumbleweed-amd64:
environment: [DISTRO=opensuse, VERSION=tumbleweed, FILES=rpm]
+ environment: [TARGET=pvs-studio, FILES=pvs-studio] - - tasks: [import, pvs-studio]
- environment: [dockerhub_username, dockerhub_password]
- - tasks: [login, pvs-studio-push]
+ - tasks: [import, build-target] environment: [TARGET=scanbuild, FILES=scanbuild]
- - tasks: [import, simple-build]
- environment: [DOCKERHUB_USERNAME, DOCKERHUB_PASSWORD, TARGET=scanbuild]
- - tasks: [login, simple-push]
+ - tasks: [import, build-target] environment: [DISTRO=ubuntu, VERSION=bionic, FILES=debian]
- # stuff after this needs cleanup...
+ environment: [DISTRO=ubuntu, VERSION=cosmic, FILES=debian]
+ - tasks: [import, build]
- plans: [alpine-edge-amd64]
- plans: [debian-stretch-amd64, debian-buster-amd64]
- plans: [fedora-28-amd64, fedora-29-amd64]
- plans: [opensuse-tumbleweed-amd64]
+ environment: [DISTRO=ubuntu, VERSION=disco, FILES=debian] + - tasks: [import, build]
- plans: [ubuntu-bionic-amd64]
- - opensuse-tumbleweed-amd64
--- a/coverity/build.sh Thu Jan 24 02:59:55 2019 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# Copyright (C) 2015-2016 Gary Kramlich <grim@reaperworld.com>
-# 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 program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-ARTIFACTS_DIR=${CONVEY_WORKSPACE}/${ARTIFACTS_DIR:-artifacts}
-mkdir -p ${ARTIFACTS_DIR}
-meson --warnlevel 3 build-coverity
-cov-build --dir cov-int ninja -v
-tar cjf ${ARTIFACTS_DIR}/cov.tar.bz2 cov-int
--- a/gplugin-builders.sublime-project Thu Jan 24 02:59:55 2019 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@