From a4f174bb2708b61480c221c3dddd06b183965564 Mon Sep 17 00:00:00 2001 From: sunrisepeak Date: Mon, 1 Jun 2026 14:58:21 +0800 Subject: [PATCH] ci: reuse mcpp smoke sandbox --- .github/workflows/validate.yml | 3 +++ pkgs/c/compat.khrplatform.lua | 2 +- pkgs/c/compat.libarchive.lua | 2 +- pkgs/c/compat.x11.lua | 2 +- pkgs/c/compat.xau.lua | 2 +- pkgs/c/compat.xcursor.lua | 2 +- pkgs/c/compat.xdmcp.lua | 2 +- pkgs/c/compat.xext.lua | 2 +- pkgs/c/compat.xfixes.lua | 2 +- pkgs/c/compat.xi.lua | 2 +- pkgs/c/compat.xinerama.lua | 2 +- pkgs/c/compat.xorgproto.lua | 2 +- pkgs/c/compat.xrandr.lua | 2 +- pkgs/c/compat.xrender.lua | 2 +- pkgs/c/compat.xtrans.lua | 2 +- pkgs/c/compat.xz.lua | 2 +- pkgs/c/compat.zstd.lua | 2 +- tests/smoke_compat_archive.sh | 6 +++++- tests/smoke_compat_core.sh | 6 +++++- tests/smoke_compat_imgui.sh | 6 +++++- tests/smoke_compat_imgui_window.sh | 6 +++++- 21 files changed, 39 insertions(+), 20 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 2fe5da0..e962739 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -70,7 +70,10 @@ jobs: echo "MCPP_VENDORED_XLINGS=$root/registry/bin/xlings" >> "$GITHUB_ENV" echo "$root/bin" >> "$GITHUB_PATH" - name: Run compat smoke tests + env: + MCPP_INDEX_SMOKE_MCPP_HOME: ${{ runner.temp }}/mcpp-smoke-home run: | + mkdir -p "$MCPP_INDEX_SMOKE_MCPP_HOME" "$MCPP" --version timeout 1800 bash tests/smoke_compat_core.sh timeout 1800 bash tests/smoke_compat_imgui.sh diff --git a/pkgs/c/compat.khrplatform.lua b/pkgs/c/compat.khrplatform.lua index cb58baa..3a5118f 100644 --- a/pkgs/c/compat.khrplatform.lua +++ b/pkgs/c/compat.khrplatform.lua @@ -3,7 +3,7 @@ package = { namespace = "compat", name = "compat.khrplatform", description = "Khronos KHR platform header for OpenGL/EGL compat packages", - licenses = {"MIT"}, + licenses = {"Khronos"}, repo = "https://github.com/KhronosGroup/EGL-Registry", type = "package", diff --git a/pkgs/c/compat.libarchive.lua b/pkgs/c/compat.libarchive.lua index 780297c..de75213 100644 --- a/pkgs/c/compat.libarchive.lua +++ b/pkgs/c/compat.libarchive.lua @@ -3,7 +3,7 @@ package = { namespace = "compat", name = "compat.libarchive", description = "Multi-format archive and compression library", - licenses = {"BSD-2-Clause"}, + licenses = {"BSD-2-Clause", "BSD-3-Clause", "BSD-2-Clause-NetBSD", "CC0-1.0", "OpenSSL", "Apache-2.0", "public-domain"}, repo = "https://libarchive.org/", type = "package", diff --git a/pkgs/c/compat.x11.lua b/pkgs/c/compat.x11.lua index c6cee3c..e7f0bd4 100644 --- a/pkgs/c/compat.x11.lua +++ b/pkgs/c/compat.x11.lua @@ -3,7 +3,7 @@ package = { namespace = "compat", name = "compat.x11", description = "Xlib runtime library and public headers built from upstream sources", - licenses = {"MIT"}, + licenses = {"BSD-1-Clause", "HPND-sell-variant", "ISC", "MIT", "MIT-Open-Group", "X11"}, repo = "https://gitlab.freedesktop.org/xorg/lib/libx11", type = "package", diff --git a/pkgs/c/compat.xau.lua b/pkgs/c/compat.xau.lua index b3ee793..01723bc 100644 --- a/pkgs/c/compat.xau.lua +++ b/pkgs/c/compat.xau.lua @@ -3,7 +3,7 @@ package = { namespace = "compat", name = "compat.xau", description = "X authorization file management library", - licenses = {"MIT"}, + licenses = {"MIT-Open-Group"}, repo = "https://gitlab.freedesktop.org/xorg/lib/libxau", type = "package", diff --git a/pkgs/c/compat.xcursor.lua b/pkgs/c/compat.xcursor.lua index 12f914d..5f5c70e 100644 --- a/pkgs/c/compat.xcursor.lua +++ b/pkgs/c/compat.xcursor.lua @@ -3,7 +3,7 @@ package = { namespace = "compat", name = "compat.xcursor", description = "X cursor management runtime library and public headers", - licenses = {"MIT"}, + licenses = {"HPND-sell-variant"}, repo = "https://gitlab.freedesktop.org/xorg/lib/libxcursor", type = "package", diff --git a/pkgs/c/compat.xdmcp.lua b/pkgs/c/compat.xdmcp.lua index 70fe5a2..14ebfd3 100644 --- a/pkgs/c/compat.xdmcp.lua +++ b/pkgs/c/compat.xdmcp.lua @@ -3,7 +3,7 @@ package = { namespace = "compat", name = "compat.xdmcp", description = "X Display Manager Control Protocol library", - licenses = {"MIT"}, + licenses = {"MIT-Open-Group"}, repo = "https://gitlab.freedesktop.org/xorg/lib/libxdmcp", type = "package", diff --git a/pkgs/c/compat.xext.lua b/pkgs/c/compat.xext.lua index f50bf93..c203ad0 100644 --- a/pkgs/c/compat.xext.lua +++ b/pkgs/c/compat.xext.lua @@ -3,7 +3,7 @@ package = { namespace = "compat", name = "compat.xext", description = "X11 miscellaneous extensions runtime library and public headers", - licenses = {"MIT"}, + licenses = {"HPND-sell-variant", "ISC", "MIT", "MIT-Open-Group"}, repo = "https://gitlab.freedesktop.org/xorg/lib/libxext", type = "package", diff --git a/pkgs/c/compat.xfixes.lua b/pkgs/c/compat.xfixes.lua index eb3e23b..28765e5 100644 --- a/pkgs/c/compat.xfixes.lua +++ b/pkgs/c/compat.xfixes.lua @@ -3,7 +3,7 @@ package = { namespace = "compat", name = "compat.xfixes", description = "X Fixes extension runtime library and public headers", - licenses = {"MIT"}, + licenses = {"HPND-sell-variant"}, repo = "https://gitlab.freedesktop.org/xorg/lib/libxfixes", type = "package", diff --git a/pkgs/c/compat.xi.lua b/pkgs/c/compat.xi.lua index 1c15140..903adbf 100644 --- a/pkgs/c/compat.xi.lua +++ b/pkgs/c/compat.xi.lua @@ -3,7 +3,7 @@ package = { namespace = "compat", name = "compat.xi", description = "X Input extension runtime library and public headers", - licenses = {"MIT"}, + licenses = {"MIT-Open-Group"}, repo = "https://gitlab.freedesktop.org/xorg/lib/libxi", type = "package", diff --git a/pkgs/c/compat.xinerama.lua b/pkgs/c/compat.xinerama.lua index 08a146f..f76a0cf 100644 --- a/pkgs/c/compat.xinerama.lua +++ b/pkgs/c/compat.xinerama.lua @@ -3,7 +3,7 @@ package = { namespace = "compat", name = "compat.xinerama", description = "Xinerama extension runtime library and public headers", - licenses = {"MIT"}, + licenses = {"MIT-Open-Group"}, repo = "https://gitlab.freedesktop.org/xorg/lib/libxinerama", type = "package", diff --git a/pkgs/c/compat.xorgproto.lua b/pkgs/c/compat.xorgproto.lua index b692f29..56f4a02 100644 --- a/pkgs/c/compat.xorgproto.lua +++ b/pkgs/c/compat.xorgproto.lua @@ -3,7 +3,7 @@ package = { namespace = "compat", name = "compat.xorgproto", description = "X.Org protocol headers for X11-based compat packages", - licenses = {"MIT"}, + licenses = {}, repo = "https://gitlab.freedesktop.org/xorg/proto/xorgproto", type = "package", diff --git a/pkgs/c/compat.xrandr.lua b/pkgs/c/compat.xrandr.lua index ccf29df..3939072 100644 --- a/pkgs/c/compat.xrandr.lua +++ b/pkgs/c/compat.xrandr.lua @@ -3,7 +3,7 @@ package = { namespace = "compat", name = "compat.xrandr", description = "X Resize, Rotate and Reflect extension runtime library and public headers", - licenses = {"MIT"}, + licenses = {"HPND-sell-variant"}, repo = "https://gitlab.freedesktop.org/xorg/lib/libxrandr", type = "package", diff --git a/pkgs/c/compat.xrender.lua b/pkgs/c/compat.xrender.lua index d91255a..ef3e0f1 100644 --- a/pkgs/c/compat.xrender.lua +++ b/pkgs/c/compat.xrender.lua @@ -3,7 +3,7 @@ package = { namespace = "compat", name = "compat.xrender", description = "X Rendering extension runtime library and public headers", - licenses = {"MIT"}, + licenses = {"HPND-sell-variant"}, repo = "https://gitlab.freedesktop.org/xorg/lib/libxrender", type = "package", diff --git a/pkgs/c/compat.xtrans.lua b/pkgs/c/compat.xtrans.lua index 1264a5a..1c1b56d 100644 --- a/pkgs/c/compat.xtrans.lua +++ b/pkgs/c/compat.xtrans.lua @@ -3,7 +3,7 @@ package = { namespace = "compat", name = "compat.xtrans", description = "X.Org transport layer support headers used by Xlib", - licenses = {"MIT"}, + licenses = {"HPND-sell-variant", "MIT", "MIT-Open-Group"}, repo = "https://gitlab.freedesktop.org/xorg/lib/libxtrans", type = "package", diff --git a/pkgs/c/compat.xz.lua b/pkgs/c/compat.xz.lua index e71ac97..8e2ace7 100644 --- a/pkgs/c/compat.xz.lua +++ b/pkgs/c/compat.xz.lua @@ -3,7 +3,7 @@ package = { namespace = "compat", name = "compat.xz", description = "XZ Utils liblzma compression library", - licenses = {"0BSD", "LGPL-2.1-or-later"}, + licenses = {"0BSD"}, repo = "https://github.com/tukaani-project/xz", type = "package", diff --git a/pkgs/c/compat.zstd.lua b/pkgs/c/compat.zstd.lua index 76b6f64..b99ff6d 100644 --- a/pkgs/c/compat.zstd.lua +++ b/pkgs/c/compat.zstd.lua @@ -3,7 +3,7 @@ package = { namespace = "compat", name = "compat.zstd", description = "Zstandard real-time compression algorithm", - licenses = {"BSD-3-Clause"}, + licenses = {"BSD-3-Clause", "GPL-2.0-only"}, repo = "https://github.com/facebook/zstd", type = "package", diff --git a/tests/smoke_compat_archive.sh b/tests/smoke_compat_archive.sh index 00ff337..374090c 100755 --- a/tests/smoke_compat_archive.sh +++ b/tests/smoke_compat_archive.sh @@ -22,7 +22,11 @@ fi SMOKE_CACHE_DIR="${MCPP_INDEX_SMOKE_CACHE_DIR:-}" SMOKE_XPKGS_DIR="${MCPP_INDEX_SMOKE_XPKGS_DIR:-}" -export MCPP_HOME="$TMP/mcpp-home" +if [[ -n "${MCPP_INDEX_SMOKE_MCPP_HOME:-}" ]]; then + export MCPP_HOME="$MCPP_INDEX_SMOKE_MCPP_HOME" +else + export MCPP_HOME="$TMP/mcpp-home" +fi mkdir -p "$MCPP_HOME" USER_MCPP="${HOME}/.mcpp" diff --git a/tests/smoke_compat_core.sh b/tests/smoke_compat_core.sh index ce26dcc..252d8fd 100755 --- a/tests/smoke_compat_core.sh +++ b/tests/smoke_compat_core.sh @@ -18,7 +18,11 @@ trap 'rm -rf "$TMP"' EXIT SMOKE_CACHE_DIR="${MCPP_INDEX_SMOKE_CACHE_DIR:-}" SMOKE_XPKGS_DIR="${MCPP_INDEX_SMOKE_XPKGS_DIR:-}" -export MCPP_HOME="$TMP/mcpp-home" +if [[ -n "${MCPP_INDEX_SMOKE_MCPP_HOME:-}" ]]; then + export MCPP_HOME="$MCPP_INDEX_SMOKE_MCPP_HOME" +else + export MCPP_HOME="$TMP/mcpp-home" +fi mkdir -p "$MCPP_HOME/registry/data/xpkgs" USER_MCPP="${HOME}/.mcpp" diff --git a/tests/smoke_compat_imgui.sh b/tests/smoke_compat_imgui.sh index 0b4eb50..7875a0c 100755 --- a/tests/smoke_compat_imgui.sh +++ b/tests/smoke_compat_imgui.sh @@ -22,7 +22,11 @@ fi SMOKE_CACHE_DIR="${MCPP_INDEX_SMOKE_CACHE_DIR:-}" SMOKE_XPKGS_DIR="${MCPP_INDEX_SMOKE_XPKGS_DIR:-}" -export MCPP_HOME="$TMP/mcpp-home" +if [[ -n "${MCPP_INDEX_SMOKE_MCPP_HOME:-}" ]]; then + export MCPP_HOME="$MCPP_INDEX_SMOKE_MCPP_HOME" +else + export MCPP_HOME="$TMP/mcpp-home" +fi mkdir -p "$MCPP_HOME" USER_MCPP="${HOME}/.mcpp" diff --git a/tests/smoke_compat_imgui_window.sh b/tests/smoke_compat_imgui_window.sh index 739d972..02f4cab 100755 --- a/tests/smoke_compat_imgui_window.sh +++ b/tests/smoke_compat_imgui_window.sh @@ -23,7 +23,11 @@ fi SMOKE_CACHE_DIR="${MCPP_INDEX_SMOKE_CACHE_DIR:-}" SMOKE_XPKGS_DIR="${MCPP_INDEX_SMOKE_XPKGS_DIR:-}" -export MCPP_HOME="$TMP/mcpp-home" +if [[ -n "${MCPP_INDEX_SMOKE_MCPP_HOME:-}" ]]; then + export MCPP_HOME="$MCPP_INDEX_SMOKE_MCPP_HOME" +else + export MCPP_HOME="$TMP/mcpp-home" +fi mkdir -p "$MCPP_HOME/registry/data/xpkgs" USER_MCPP="${HOME}/.mcpp"