CI: remove unused meson-prep.sh and meson-test.sh scripts
authorPeter Hutterer <peter.hutterer@who-t.net>
Thu, 6 Apr 2023 05:39:20 +0000 (15:39 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Tue, 11 Apr 2023 00:13:08 +0000 (00:13 +0000)
From an earlier version of the b2c patches, before meson-build.sh got
updated to do what's required here.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
.gitlab-ci/meson-prep.sh [deleted file]
.gitlab-ci/meson-test.sh [deleted file]

diff --git a/.gitlab-ci/meson-prep.sh b/.gitlab-ci/meson-prep.sh
deleted file mode 100644 (file)
index e2630fe..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-if [[ -f .meson_environment ]]; then
-       . .meson_environment
-fi
-
-if [[ -z "$MESON_BUILDDIR" ]]; then
-       echo "\$MESON_BUILDDIR undefined."
-       exit 1
-fi
-
-# emulate a few gitlab variables to make it easier to
-# run and debug locally.
-if [[ -z "$CI_JOB_ID" ]] || [[ -z "$CI_JOB_NAME" ]]; then
-       echo "Missing \$CI_JOB_ID or \$CI_JOB_NAME".
-       CI_JOB_ID=$(date +%s)
-       CI_JOB_NAME='libinput-job-local'
-       echo "Simulating gitlab environment: "
-       echo " CI_JOB_ID=$CI_JOB_ID"
-       echo " CI_JOB_NAME=$CI_JOB_NAME"
-fi
-
-if [[ -n "$FDO_CI_CONCURRENT" ]]; then
-       NINJA_ARGS="-j$FDO_CI_CONCURRENT $NINJA_ARGS"
-       MESON_TESTTHREADS="$FDO_CI_CONCURRENT"
-fi
-
-echo "*************************************************"
-echo "builddir: $MESON_BUILDDIR"
-echo "meson args: $MESON_ARGS"
-echo "ninja args: $NINJA_ARGS"
-echo "meson test args: $MESON_TEST_ARGS"
-echo "*************************************************"
-
-set -e
diff --git a/.gitlab-ci/meson-test.sh b/.gitlab-ci/meson-test.sh
deleted file mode 100755 (executable)
index ef72dfb..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
-. $DIR/meson-prep.sh
-
-if [[ -z "$MESON_TEST_ARGS" ]]; then
-    echo "\$MESON_TEST_ARGS undefined."
-    exit 1
-fi
-
-meson test -C "$MESON_BUILDDIR" $MESON_TEST_ARGS --print-errorlogs