talkatu/builders

Overhaul all the things!

2021-10-18, Gary Kramlich
b00d27c61494
Parents 630522a2e612
Children c40af49a0bed
Overhaul all the things!
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dockerfile.debian-bookworm-amd64 Mon Oct 18 14:15:54 2021 -0500
@@ -0,0 +1,24 @@
+FROM debian:bookworm
+
+MAINTAINER Gary Kramlich <grim@reaperworld.com>
+
+RUN set -ex && \
+ apt-get update && \
+ apt-get install -y --no-install-recommends \
+ devscripts fakeroot debhelper libdistro-info-perl \
+ build-essential meson gettext help2man mercurial libxml2-utils git \
+ libglib2.0-dev gobject-introspection libgirepository1.0-dev \
+ libgtk-3-dev libgtk-3-bin \
+ libgumbo-dev libcmark-dev libgladeui-dev libgspell-1-dev \
+ valac \
+ python3-jinja2 python3-pygments python3-toml python3-typogrify \
+ && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists
+
+CMD ["/build.sh"]
+
+ENV TARGET=debian-bookworm-amd64
+
+COPY debian/build.sh /build.sh
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dockerfile.debian-bookworm-arm64 Mon Oct 18 14:15:54 2021 -0500
@@ -0,0 +1,22 @@
+FROM docker.io/arm64v8/debian:bookworm
+
+RUN set -ex && \
+ apt-get update && \
+ apt-get install -y --no-install-recommends \
+ devscripts fakeroot debhelper libdistro-info-perl \
+ build-essential meson gettext help2man mercurial libxml2-utils git \
+ libglib2.0-dev gobject-introspection libgirepository1.0-dev \
+ libgtk-3-dev libgtk-3-bin \
+ libgumbo-dev libcmark-dev libgladeui-dev libgspell-1-dev \
+ valac \
+ python3-jinja2 python3-pygments python3-toml python3-typogrify \
+ && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists
+
+CMD ["/build.sh"]
+
+ENV TARGET=debian-bookworm-arm64
+
+COPY debian/build.sh /build.sh
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dockerfile.debian-bookworm-armhf Mon Oct 18 14:15:54 2021 -0500
@@ -0,0 +1,22 @@
+FROM docker.io/arm32v7/debian:bookworm
+
+RUN set -ex && \
+ apt-get update && \
+ apt-get install -y --no-install-recommends \
+ devscripts fakeroot debhelper libdistro-info-perl \
+ build-essential meson gettext help2man mercurial libxml2-utils git \
+ libglib2.0-dev gobject-introspection libgirepository1.0-dev \
+ libgtk-3-dev libgtk-3-bin gtk-doc-tools \
+ libgumbo-dev libcmark-dev libgladeui-dev libgspell-1-dev \
+ valac \
+ python3-jinja2 python3-pygments python3-toml python3-typogrify \
+ && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists
+
+CMD ["/build.sh"]
+
+ENV TARGET=debian-bookworm-armhf
+
+COPY debian/build.sh /build.sh
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dockerfile.debian-bookworm-i386 Mon Oct 18 14:15:54 2021 -0500
@@ -0,0 +1,22 @@
+FROM docker.io/i386/debian:bookworm
+
+RUN set -ex && \
+ apt-get update && \
+ apt-get install -y --no-install-recommends \
+ devscripts fakeroot debhelper libdistro-info-perl \
+ build-essential meson gettext help2man mercurial libxml2-utils git \
+ libglib2.0-dev gobject-introspection libgirepository1.0-dev \
+ libgtk-3-dev libgtk-3-bin \
+ libgumbo-dev libcmark-dev libgladeui-dev libgspell-1-dev \
+ valac \
+ python3-jinja2 python3-pygments python3-toml python3-typogrify \
+ && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists
+
+CMD ["/build.sh"]
+
+ENV TARGET=debian-bookworm-i386
+
+COPY debian/build.sh /build.sh
+
--- a/Dockerfile.debian-bullseye-amd64 Fri Oct 15 00:19:20 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# vi:ft=dockerfile
-FROM debian:bullseye-slim
-
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
-
-RUN set -ex && \
- apt-get update && \
- apt-get install -y --no-install-recommends \
- devscripts fakeroot debhelper libdistro-info-perl \
- build-essential meson gettext help2man mercurial libxml2-utils \
- libglib2.0-dev gobject-introspection libgirepository1.0-dev \
- libgtk-3-dev libgtk-3-bin \
- libgumbo-dev libcmark-dev libgladeui-dev libgspell-1-dev \
- valac \
- python3-jinja2 python3-pygments python3-toml python3-typogrify \
- && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists
-
-CMD ["/build.sh"]
-
-ENV DISTRIBUTION=bullseye \
- ARCH=amd64
-
-COPY debian/build.sh /build.sh
-
--- a/Dockerfile.debian-buster-amd64 Fri Oct 15 00:19:20 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# vi:ft=dockerfile
-FROM debian:buster-slim
-
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
-
-RUN set -ex && \
- echo deb http://deb.debian.org/debian buster-backports main > /etc/apt/sources.list.d/backports.list && \
- apt-get update && \
- apt-get install -y --no-install-recommends -t buster-backports \
- devscripts fakeroot debhelper libdistro-info-perl \
- build-essential meson gettext help2man mercurial libxml2-utils \
- libglib2.0-dev gobject-introspection libgirepository1.0-dev \
- libgtk-3-dev libgtk-3-bin gtk-doc-tools \
- libgumbo-dev libcmark-dev libgladeui-dev libgspell-1-dev \
- valac \
- && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists
-
-CMD ["/build.sh"]
-
-ENV DISTRIBUTION=buster \
- ARCH=amd64
-
-COPY debian/build.sh /build.sh
-
--- a/Dockerfile.debian-buster-arm64 Fri Oct 15 00:19:20 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# vi:ft=dockerfile
-FROM arm64v8/debian:buster-slim
-
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
-
-RUN set -ex && \
- echo deb http://deb.debian.org/debian buster-backports main > /etc/apt/sources.list.d/backports.list && \
- apt-get update && \
- apt-get install -y --no-install-recommends -t buster-backports \
- devscripts fakeroot debhelper libdistro-info-perl \
- build-essential meson gettext help2man mercurial libxml2-utils \
- libglib2.0-dev gobject-introspection libgirepository1.0-dev \
- libgtk-3-dev libgtk-3-bin gtk-doc-tools \
- libgumbo-dev libcmark-dev libgladeui-dev libgspell-1-dev \
- valac \
- && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists
-
-CMD ["/build.sh"]
-
-ENV DISTRIBUTION=buster \
- ARCH=aarch64
-
-COPY debian/build.sh /build.sh
-
--- a/Dockerfile.debian-buster-armhf Fri Oct 15 00:19:20 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# vi:ft=dockerfile
-FROM arm32v7/debian:buster-slim
-
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
-
-RUN set -ex && \
- echo deb http://deb.debian.org/debian buster-backports main > /etc/apt/sources.list.d/backports.list && \
- apt-get update && \
- apt-get install -y --no-install-recommends -t buster-backports \
- devscripts fakeroot debhelper libdistro-info-perl \
- build-essential meson gettext help2man mercurial libxml2-utils \
- libglib2.0-dev gobject-introspection libgirepository1.0-dev \
- libgtk-3-dev libgtk-3-bin gtk-doc-tools \
- libgumbo-dev libcmark-dev libgladeui-dev libgspell-1-dev \
- valac \
- && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists
-
-CMD ["/build.sh"]
-
-ENV DISTRIBUTION=buster \
- ARCH=aarch64
-
-COPY debian/build.sh /build.sh
-
--- a/Dockerfile.debian-buster-i386 Fri Oct 15 00:19:20 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# vi:ft=dockerfile
-FROM i386/debian:buster-slim
-
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
-
-RUN set -ex && \
- echo deb http://deb.debian.org/debian buster-backports main > /etc/apt/sources.list.d/backports.list && \
- apt-get update && \
- apt-get install -y --no-install-recommends -t buster-backports \
- devscripts fakeroot debhelper libdistro-info-perl \
- build-essential meson gettext help2man mercurial libxml2-utils \
- libglib2.0-dev gobject-introspection libgirepository1.0-dev \
- libgtk-3-dev libgtk-3-bin gtk-doc-tools \
- libgumbo-dev libcmark-dev libgladeui-dev libgspell-1-dev \
- valac \
- && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists
-
-CMD ["/build.sh"]
-
-ENV DISTRIBUTION=buster \
- ARCH=i386
-
-COPY debian/build.sh /build.sh
-
--- a/Dockerfile.fedora-31-amd64 Fri Oct 15 00:19:20 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# vi:et:ft=dockerfile
-FROM fedora:31
-
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
-
-RUN set -ex && \
- dnf install -y \
- meson ninja-build gcc mercurial \
- redhat-rpm-config rpm-build \
- help2man gettext \
- glib2-devel gobject-introspection-devel gtk3-devel gtk-doc \
- cmark-devel gspell-devel gumbo-parser-devel glade-devel \
- vala
-
-CMD ["/build.sh"]
-
-ENV DISTRIBUTION=fedora \
- VERSION=31 \
- ARCH=amd64
-
-COPY rpm/build.sh /build.sh
-
--- a/Dockerfile.fedora-32-amd64 Fri Oct 15 00:19:20 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# vi:et:ft=dockerfile
-FROM fedora:32
-
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
-
-RUN set -ex && \
- dnf install -y \
- meson ninja-build gcc mercurial \
- redhat-rpm-config rpm-build \
- help2man gettext \
- glib2-devel gobject-introspection-devel gtk3-devel gtk-doc \
- cmark-devel gspell-devel gumbo-parser-devel glade-devel \
- vala
-
-CMD ["/build.sh"]
-
-ENV DISTRIBUTION=fedora \
- VERSION=32 \
- ARCH=amd64
-
-COPY rpm/build.sh /build.sh
-
--- a/Dockerfile.fedora-33-amd64 Fri Oct 15 00:19:20 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# vi:et:ft=dockerfile
-FROM fedora:33
-
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
-
-RUN set -ex && \
- dnf install -y \
- meson ninja-build make gcc mercurial \
- redhat-rpm-config rpm-build \
- help2man gettext \
- glib2-devel gobject-introspection-devel gtk3-devel gtk-doc \
- cmark-devel gspell-devel gumbo-parser-devel glade-devel \
- vala
-
-CMD ["/build.sh"]
-
-ENV DISTRIBUTION=fedora \
- VERSION=33 \
- ARCH=amd64
-
-COPY rpm/build.sh /build.sh
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dockerfile.fedora-34-amd64 Mon Oct 18 14:15:54 2021 -0500
@@ -0,0 +1,20 @@
+FROM fedora:34
+
+MAINTAINER Gary Kramlich <grim@reaperworld.com>
+
+RUN set -ex && \
+ dnf install -y \
+ meson ninja-build make gcc mercurial \
+ redhat-rpm-config rpm-build \
+ help2man gettext \
+ glib2-devel gobject-introspection-devel gtk3-devel \
+ cmark-devel gspell-devel gumbo-parser-devel glade-devel \
+ vala \
+ gi-docgen
+
+CMD ["/build.sh"]
+
+ENV TARGET=fedora-34-amd64
+
+COPY rpm/build.sh /build.sh
+
--- a/Dockerfile.fedora-rawhide-amd64 Fri Oct 15 00:19:20 2021 -0500
+++ b/Dockerfile.fedora-rawhide-amd64 Mon Oct 18 14:15:54 2021 -0500
@@ -1,4 +1,3 @@
-# vi:et:ft=dockerfile
FROM fedora:rawhide
MAINTAINER Gary Kramlich <grim@reaperworld.com>
@@ -8,15 +7,14 @@
meson ninja-build make gcc mercurial \
redhat-rpm-config rpm-build \
help2man gettext \
- glib2-devel gobject-introspection-devel gtk3-devel gtk-doc \
+ glib2-devel gobject-introspection-devel gtk3-devel \
cmark-devel gspell-devel gumbo-parser-devel glade-devel \
- vala
+ vala \
+ gi-docgen
CMD ["/build.sh"]
-ENV DISTRIBUTION=fedora \
- VERSION=rawhide \
- ARCH=amd64
+ENV TARGET=fedora-rawhide-amd64
COPY rpm/build.sh /build.sh
--- a/Dockerfile.mingw-w64-i686 Fri Oct 15 00:19:20 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# vi:et:ft=dockerfile
-FROM rwgrim/msys2-cross:latest
-
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
-
-# setup the cross compile and host os
-RUN set -ex && \
- dpkg --add-architecture i386 && \
- apt-get update && \
- apt-get install -y --no-install-recommends -o APT::Immediate-Configure=false \
- ca-certificates build-essential gettext xz-utils pkg-config zip \
- mingw-w64 mingw-w64-i686-dev mingw-w64-tools \
- mercurial meson ninja-build help2man \
- wine wine32 \
- libglib2.0-dev gobject-introspection \
- && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists
-
-# install our target depedencies
-RUN set -ex && \
- pacman-cross -Syy --noconfirm \
- mingw32/mingw-w64-i686-cmark \
- 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-glade \
- mingw32/mingw-w64-i686-gspell \
- mingw32/mingw-w64-i686-gumbo-parser \
- mingw32/mingw-w64-i686-vala
-
-CMD ["/build.sh"]
-
-ENV MINGW_DISTRO=mingw-w64-i686
-
-COPY mingw/build.sh /
-
--- a/Dockerfile.mingw-w64-x86_64 Fri Oct 15 00:19:20 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-# vi:et:ft=dockerfile
-FROM rwgrim/msys2-cross:latest
-
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
-
-# setup the cross compile and host os
-RUN set -ex && \
- apt-get update && \
- apt-get install -y --no-install-recommends \
- 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 \
- libglib2.0-dev gobject-introspection \
- && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists
-
-# install our target depedencies
-RUN set -ex && \
- pacman-cross -Syy --noconfirm \
- mingw64/mingw-w64-x86_64-cmark \
- 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-glade \
- mingw64/mingw-w64-x86_64-gspell \
- mingw64/mingw-w64-x86_64-gumbo-parser \
- mingw64/mingw-w64-x86_64-vala
-
-CMD ["/build.sh"]
-
-ENV MINGW_DISTRO=mingw-w64-x86_64
-
-COPY mingw/build.sh /
-
--- a/Dockerfile.pvs-studio Fri Oct 15 00:19:20 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-FROM talkatu/builders:debian-bullseye-amd64
-
-ENV PVS_STUDIO_DOWNLOAD_URL=https://files.viva64.com/pvs-studio-latest.tgz
-
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
-
-RUN set -ex && \
- apt-get update && \
- apt-get install -y --no-install-recommends wget strace && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists
-
-RUN set -ex && \
- cd /tmp && \
- wget -O pvs-studio.tgz ${PVS_STUDIO_DOWNLOAD_URL} && \
- tar zxf pvs-studio.tgz && \
- rm pvs-studio.tgz && \
- cd pvs-studio-* && \
- ./install.sh && \
- cd .. && \
- rm -rf pvs-studio-*
-
-COPY pvs-studio/build.sh /
-
--- a/Dockerfile.scanbuild Fri Oct 15 00:19:20 2021 -0500
+++ b/Dockerfile.scanbuild Mon Oct 18 14:15:54 2021 -0500
@@ -1,6 +1,4 @@
-FROM talkatu/builders:debian-bullseye-amd64
-
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
+FROM docker.io/talkatu/builders:debian-bookworm-amd64
RUN set -ex && \
apt-get update && \
--- a/Dockerfile.valgrind Fri Oct 15 00:19:20 2021 -0500
+++ b/Dockerfile.valgrind Mon Oct 18 14:15:54 2021 -0500
@@ -1,9 +1,7 @@
-FROM talkatu/builders:debian-bullseye-amd64
-
-MAINTAINER Gary Kramlich <grim@reaperworld.com>
+FROM docker.io/talkatu/builders:debian-bookworm-amd64
RUN set -ex && \
- echo deb http://debug.mirrors.debian.org/debian-debug/ bullseye-debug main > /etc/apt/sources.list.d/dbgsym.list && \
+ echo deb http://debug.mirrors.debian.org/debian-debug/ bookworm-debug main > /etc/apt/sources.list.d/dbgsym.list && \
apt-get update && \
apt-get install -y --no-install-recommends \
valgrind \
--- a/convey.yml Fri Oct 15 00:19:20 2021 -0500
+++ b/convey.yml Mon Oct 18 14:15:54 2021 -0500
@@ -38,23 +38,8 @@
images: ${REGISTRY}/${REPO}:${TARGET}
plans:
- debian-buster-amd64:
- environment: TARGET=debian-buster-amd64
- stages:
- - tasks: [import, build]
-
- debian-buster-arm64:
- environment: TARGET=debian-buster-arm64
- stages:
- - tasks: [import, build]
-
- debian-buster-armhf:
- environment: TARGET=debian-buster-armhf
- stages:
- - tasks: [import, build]
-
- debian-buster-i386:
- environment: TARGET=debian-buster-i386
+ debian-bookworm-amd64:
+ environment: TARGET=debian-bookworm-amd64
stages:
- tasks: [import, build]
@@ -63,18 +48,23 @@
stages:
- tasks: [import, build]
- fedora-31-amd64:
- environment: TARGET=fedora-31-amd64
+ debian-bookworm-arm64:
+ environment: TARGET=debian-bookworm-arm64
stages:
- tasks: [import, build]
- fedora-32-amd64:
- environment: TARGET=fedora-32-amd64
+ debian-bookworm-armhf:
+ environment: TARGET=debian-bookworm-armhf
stages:
- tasks: [import, build]
- fedora-33-amd64:
- environment: TARGET=fedora-33-amd64
+ debian-bookworm-i386:
+ environment: TARGET=debian-bookworm-i386
+ stages:
+ - tasks: [import, build]
+
+ fedora-34-amd64:
+ environment: TARGET=fedora-34-amd64
stages:
- tasks: [import, build]
@@ -83,21 +73,6 @@
stages:
- tasks: [import, build]
- mingw-w64-i686:
- environment: TARGET=mingw-w64-i686
- stages:
- - tasks: [import, build]
-
- mingw-w64-x86_64:
- environment: TARGET=mingw-w64-x86_64
- stages:
- - tasks: [import, build]
-
- pvs-studio:
- environment: TARGET=pvs-studio
- stages:
- - tasks: [import, build]
-
scanbuild:
environment: TARGET=scanbuild
stages:
--- a/debian/build.sh Fri Oct 15 00:19:20 2021 -0500
+++ b/debian/build.sh Mon Oct 18 14:15:54 2021 -0500
@@ -17,9 +17,7 @@
cd "${CONVEY_WORKSPACE}"
-BUILD_TRIPLET="${DISTRIBUTION}-${VERSION}-${ARCH}"
-
-ARTIFACTS_DIR="${CONVEY_WORKSPACE}/${BUILD_TRIPLET}"
+ARTIFACTS_DIR="${CONVEY_WORKSPACE}/${TARGET}"
mkdir -p "${ARTIFACTS_DIR}"
cp -a "${CONVEY_WORKSPACE}/packaging/debian" debian
@@ -28,7 +26,7 @@
BUILD_NUMBER="${BUILD_NUMBER:-0}"
BUILD_VERSION="${BUILD_NUMBER}~${HG_ID}"
-BUILD_DIR="build-${BUILD_TRIPLET}"
+BUILD_DIR="build-${TARGET}"
export BUILD_DIR
# Add a changelog entry
@@ -40,9 +38,6 @@
EC="${?}"
set -e
-# copy the meson logs to our artifacts directory
-cp -a "${BUILD_DIR}/meson-logs" "${ARTIFACTS_DIR}"
-
# if the build failed, exit
if [ "${EC}" -ne 0 ]; then
exit "${EC}"
--- a/mingw/build.sh Fri Oct 15 00:19:20 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#!/bin/sh -ex
-# Copyright (C) 2015-2019 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
-
-cd "${CONVEY_WORKSPACE}"
-
-mkdir -p "${MINGW_DISTRO}"
-
-PKGBUILD_DIR="${PKGBUILD_DIR:-mingw-cross}"
-
-cp "${CONVEY_WORKSPACE}/packaging/${PKGBUILD_DIR}/PKGBUILD" .
-
-MINGW_PACKAGE_PREFIX="${MINGW_DISTRO}" makepkg-cross "${MAKEPKG_ARGS}"
-
-mv *.tar.zst "${CONVEY_WORKSPACE}/${MINGW_DISTRO}"
-
--- a/pvs-studio/build.sh Fri Oct 15 00:19:20 2021 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-#!/bin/sh -ex
-# Copyright (C) 2015-2020 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
-
-cd ${CONVEY_WORKSPACE}
-
-PVS_IGNORED_CODES=${PVS_IGNORED_CODES:-}
-
-BUILD_DIR="build-pvs-studio"
-PLOG_ARGS="--excludedCodes V011,V1042"
-
-if [ -n "${PVS_IGNORED_CODES}" ]; then
- PLOG_ARGS="${PLOG_ARGS},${PVS_IGNORED_CODES}"
-fi
-
-# don't leak our secrets via `set -x`
-set +x
-if [ -z "${PVS_STUDIO_USERNAME}" -o -z "${PVS_STUDIO_KEY}" ] ; then
- echo "Both PVS_STUDIO_USERNAME and PVS_STUDIO_KEY must be provided" >&2
- exit 1
-fi
-set -x
-
-# don't echo commands as we're stashing secrets
-set +x
-echo "${PVS_STUDIO_USERNAME}" > /tmp/license
-echo "${PVS_STUDIO_KEY}" >> /tmp/license
-set -x
-
-meson ${BUILD_DIR}
-cd ${BUILD_DIR}
-
-echo "running ninja because we don't have a way to just generate the built source files" >&2
-ninja
-
-echo "creating compile_commands.json"
-ninja -t compdb
-
-# run the analyzer
-pvs-studio-analyzer analyze -l /tmp/license -o pvs-studio.log
-
-# convert the output to html
-plog-converter -a GA:1,2 -t fullhtml -o pvs-studio -p ${HG_REMOTE} -v ${HG_COMMIT} ${PLOG_ARGS} pvs-studio.log
-cp -a pvs-studio ${CONVEY_WORKSPACE}
-
-# run the converter to determine if we found issues
-plog-converter -a GA:1,2 -t tasklist ${PLOG_ARGS} -o ${CONVEY_WORKSPACE}/pvs-studio/tasklist.txt pvs-studio.log
-ERRORS=$(wc -l ${CONVEY_WORKSPACE}/pvs-studio/tasklist.txt | awk '{print $1}')
-# the tasklist output has a stock line at the top, which we ignore by checking
-# if we have more than one line in the file
-if [ "${ERRORS}" -gt 1 ] ; then
- exit 1
-fi
-
-exit 0
-
--- a/rpm/build.sh Fri Oct 15 00:19:20 2021 -0500
+++ b/rpm/build.sh Mon Oct 18 14:15:54 2021 -0500
@@ -17,17 +17,15 @@
cd ${CONVEY_WORKSPACE}
-BUILD_TRIPLET=${DISTRIBUTION}-${VERSION}-${ARCH}
-
-ARTIFACTS_DIR=${CONVEY_WORKSPACE}/${BUILD_TRIPLET}
+ARTIFACTS_DIR=${CONVEY_WORKSPACE}/${TARGET}
mkdir -p ${ARTIFACTS_DIR}
BUILD_NUMBER="${BUILD_NUMBER:-0}"
BUILD_VERSION="${BUILD_NUMBER}~$(hg id -i)"
-BUILD_DIR="build-${BUILD_TRIPLET}"
+BUILD_DIR="build-${TARGET}"
# we need to generate the spec file so we need to run meson
-meson /tmp/${BUILD_TRIPLET}
+meson /tmp/${TARGET}
set +e
# now that we have our rpm spec file we can do an rpmbuild
@@ -36,12 +34,9 @@
-D "_builddir ${CONVEY_WORKSPACE}" \
-D "_vpath_builddir ${BUILD_DIR}" \
-D "build_number ${BUILD_VERSION}" \
- /tmp/${BUILD_TRIPLET}/packaging/talkatu.spec
+ /tmp/${TARGET}/packaging/talkatu.spec
EC=${?}
set -e
-# finally copy the meson-logs directory to the artifacts directory as well
-cp -a ${BUILD_DIR}/meson-logs ${ARTIFACTS_DIR}
-
exit "${EC}"
--- a/valgrind/build.sh Fri Oct 15 00:19:20 2021 -0500
+++ b/valgrind/build.sh Mon Oct 18 14:15:54 2021 -0500
@@ -19,7 +19,6 @@
BUILD_DIR="build-valgrind"
-
meson ${BUILD_DIR}
meson test -C ${BUILD_DIR} --wrapper "valgrind --leak-check=full --error-exitcode=1"
EC=${?}