gplugin/builders

Lots of clean ups

5 months ago, Gary Kramlich
6bcf4347ed9b
Parents 4db8ee62e605
Children eb3d46d5298c
Lots of clean ups

* Make sure we're using meson setup
* Make sure we're passing --verbose to meson test
* Make all of the build script shellcheck clean
7 files changed, 28 insertions(+), 27 deletions(-)
  • +1 -1
    Dockerfile.valgrind
  • +3 -4
    clang-format/build.sh
  • +4 -4
    dist/build.sh
  • +3 -3
    i18n/build.sh
  • +6 -5
    meson/build.sh
  • +7 -6
    scanbuild/build.sh
  • +4 -4
    valgrind/build.sh
    • --- a/Dockerfile.valgrind Wed Nov 08 04:28:05 2023 -0600
    +++ b/Dockerfile.valgrind Thu Nov 16 04:15:08 2023 -0600
    @@ -1,4 +1,4 @@
    -FROM gplugin/builders:fedora-38-amd64
    +FROM docker.io/gplugin/builders:fedora-39-amd64
    RUN set -ex && \
    dnf update -y && \
    --- a/clang-format/build.sh Wed Nov 08 04:28:05 2023 -0600
    +++ b/clang-format/build.sh Thu Nov 16 04:15:08 2023 -0600
    @@ -15,12 +15,12 @@
    # 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}
    +cd "${CONVEY_WORKSPACE}" || exit 1
    BUILD_DIR="build-clang-format"
    -meson ${BUILD_DIR}
    -ninja -C ${BUILD_DIR} clang-format
    +meson setup "${BUILD_DIR}"
    +ninja -C "${BUILD_DIR}" clang-format
    hg diff 2>/dev/null
    # if hg id -T returns a + it means the tree is dirty so revert it and exit 1
    @@ -30,4 +30,3 @@
    exit 1
    fi
    -
    --- a/dist/build.sh Wed Nov 08 04:28:05 2023 -0600
    +++ b/dist/build.sh Thu Nov 16 04:15:08 2023 -0600
    @@ -15,15 +15,15 @@
    # 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}
    +cd "${CONVEY_WORKSPACE}" || exit 1
    BUILD_DIR="_dist"
    -meson "${BUILD_DIR}"
    +meson setup "${BUILD_DIR}"
    meson dist -C "${BUILD_DIR}" --allow-dirty
    EC=${?}
    -cp -a ${BUILD_DIR}/meson-dist ${CONVEY_WORKSPACE}/dist
    +cp -a "${BUILD_DIR}/meson-dist" "${CONVEY_WORKSPACE}/dist"
    -exit ${?}
    +exit ${EC}
    --- a/i18n/build.sh Wed Nov 08 04:28:05 2023 -0600
    +++ b/i18n/build.sh Thu Nov 16 04:15:08 2023 -0600
    @@ -15,13 +15,13 @@
    # 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}
    +cd "${CONVEY_WORKSPACE}" || exit 1
    BUILD_DIR="build-i18n"
    -meson "${BUILD_DIR}"
    +meson setup "${BUILD_DIR}"
    ninja -C "${BUILD_DIR}" gplugin-pot
    -mkdir -p ${CONVEY_WORKSPACE}/i18n
    +mkdir -p "${CONVEY_WORKSPACE}/i18n"
    cp po/gplugin.pot i18n/
    --- a/meson/build.sh Wed Nov 08 04:28:05 2023 -0600
    +++ b/meson/build.sh Thu Nov 16 04:15:08 2023 -0600
    @@ -1,10 +1,11 @@
    #!/bin/sh -ex
    -cd ${CONVEY_WORKSPACE}
    +cd "${CONVEY_WORKSPACE}" || exit 1
    -BUILD_DIR=${TARGET:-_build}
    +BUILD_DIR="${TARGET:-_build}"
    -meson ${MESON_OPTIONS} "${BUILD_DIR}"
    -meson compile -C "${BUILD_DIR}"
    -meson test -C "${BUILD_DIR}" -v
    +# shellcheck disable=SC2086
    +meson setup ${MESON_OPTIONS} "${BUILD_DIR}"
    +meson compile --verbose -C "${BUILD_DIR}"
    +meson test --verbose -C "${BUILD_DIR}"
    --- a/scanbuild/build.sh Wed Nov 08 04:28:05 2023 -0600
    +++ b/scanbuild/build.sh Thu Nov 16 04:15:08 2023 -0600
    @@ -15,17 +15,18 @@
    # 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}
    +cd "${CONVEY_WORKSPACE}" || exit 1
    BUILD_DIR="build-scanbuild"
    -meson -Dvapi=false ${BUILD_DIR}
    -ninja -C ${BUILD_DIR} scan-build
    +meson setup -Dvapi=false "${BUILD_DIR}"
    +ninja -C "${BUILD_DIR}" scan-build
    # ninja doesn't pass --status-bugs to scan-build so we have to get hacky...
    -EC=$(ls ${BUILD_DIR}/meson-logs/scanbuild | wc -l)
    +EC=$(find "${BUILD_DIR}/meson-logs/scanbuild" -type f | wc -l)
    +
    +cp -a "${BUILD_DIR}/meson-logs/scanbuild" "${CONVEY_WORKSPACE}"
    -cp -a ${BUILD_DIR}/meson-logs/scanbuild ${CONVEY_WORKSPACE}
    +exit "${EC}"
    -exit ${EC}
    --- a/valgrind/build.sh Wed Nov 08 04:28:05 2023 -0600
    +++ b/valgrind/build.sh Thu Nov 16 04:15:08 2023 -0600
    @@ -15,16 +15,16 @@
    # 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}
    +cd "${CONVEY_WORKSPACE}" || exit 1
    BUILD_DIR="build-valgrind"
    meson ${BUILD_DIR}
    -meson test -C ${BUILD_DIR} --wrapper valgrind-wrapper
    +meson test --verbose -C "${BUILD_DIR}" --wrapper valgrind-wrapper
    EC=${?}
    -mkdir -p ${CONVEY_WORKSPACE}/valgrind
    -cp -a ${BUILD_DIR}/meson-logs/testlog-valgrind-wrapper.txt ${CONVEY_WORKSPACE}/valgrind/
    +mkdir -p "${CONVEY_WORKSPACE}/valgrind"
    +cp -a "${BUILD_DIR}/meson-logs/testlog-valgrind-wrapper.txt" "${CONVEY_WORKSPACE}/valgrind/"
    exit ${EC}