From 6d6f2b3a98669ded740c5e87e6e1e2429e5422a6 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 17 Feb 2026 17:08:12 +0100 Subject: [PATCH] .github: move some build & test pieces from pipeline to script Signed-off-by: Enrico Weigelt, metux IT consult --- .github/scripts/install-prereq.sh | 3 --- .github/scripts/run-xserver-build-and-test.sh | 23 +++++++++++++++++++ .github/workflows/build-xserver.yml | 7 ++---- 3 files changed, 25 insertions(+), 8 deletions(-) create mode 100755 .github/scripts/run-xserver-build-and-test.sh diff --git a/.github/scripts/install-prereq.sh b/.github/scripts/install-prereq.sh index 676df138d2..6f2e0ce825 100755 --- a/.github/scripts/install-prereq.sh +++ b/.github/scripts/install-prereq.sh @@ -18,6 +18,3 @@ build_meson xorgproto $(fdo_mirror xorgproto) xorgp build_ac_xts xts $(fdo_mirror xts) 6cf94400a09abecd6b86e4eb6441741acecd51f6 clone_source piglit $(fdo_mirror piglit) 59111996534f875ca88bce51f21fa2e6564895da - -echo '[xts]' > piglit/piglit.conf -echo "path=$X11_BUILD_DIR/xts" >> piglit/piglit.conf diff --git a/.github/scripts/run-xserver-build-and-test.sh b/.github/scripts/run-xserver-build-and-test.sh new file mode 100755 index 0000000000..275e54e1ee --- /dev/null +++ b/.github/scripts/run-xserver-build-and-test.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +set -e + +if [ ! "$X11_BUILD_DIR" ]; then + echo "missing X11_BUILD_DIR" >&2 + exit 1 +fi + +if [ ! "$MESON_BUILDDIR" ]; then + echo "missing MESON_BUILDDIR" >&2 + exit 1 +fi + +echo "=== X11_BUILD_DIR=$X11_BUILD_DIR" +echo "=== MESON_BUILDDIR=$MESON_BUILDDIR" + +.github/scripts/meson-build.sh + +echo '[xts]' > $X11_BUILD_DIR/piglit/piglit.conf +echo "path=$X11_BUILD_DIR/xts" >> $X11_BUILD_DIR/piglit/piglit.conf + +meson test -C "$MESON_BUILDDIR" --print-errorlogs diff --git a/.github/workflows/build-xserver.yml b/.github/workflows/build-xserver.yml index d33cdae563..f0f6c77184 100644 --- a/.github/workflows/build-xserver.yml +++ b/.github/workflows/build-xserver.yml @@ -54,11 +54,8 @@ jobs: - name: generic prereq run: .github/scripts/install-prereq.sh - - name: build - run: .github/scripts/meson-build.sh - - - name: tests - run: meson test -C "${{ env.MESON_BUILDDIR }}" --print-errorlogs + - name: build and test + run: .github/scripts/run-xserver-build-and-test.sh env: XTEST_DIR: ${{ env.X11_BUILD_DIR }}/xts PIGLIT_DIR: ${{ env.X11_BUILD_DIR }}/piglit