Split platform CI from release archives

Frityet · Frityet · commit 7e2dfd4105ae · 2026-07-01T10:21:40.000Z
diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml
@@ -18,9 +18,23 @@ env:
   LJ_RELEASE_RUN_STOCK: "0"
 
 jobs:
+  validate:
+    name: Validate rolling tag
+    runs-on: ubuntu-24.04
+    env:
+      RELEASE_TAG: ${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref_name }}
+    steps:
+      - name: Validate bX.Y.Z tag
+        run: |
+          if [[ ! "$RELEASE_TAG" =~ ^b[0-9]+[.][0-9]+[.][0-9]+$ ]]; then
+            echo "::error::rolling releases must use b<major>.<minor>.<patch> tags, got '$RELEASE_TAG'"
+            exit 1
+          fi
+
   linux:
     name: Linux x86_64 artifact
     runs-on: ubuntu-24.04
+    needs: validate
     env:
       RELEASE_TAG: ${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref_name }}
       SOURCE_REF: ${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref }}
@@ -58,6 +72,7 @@ jobs:
   macos:
     name: macOS x86_64 artifact
     runs-on: macos-13
+    needs: validate
     env:
       RELEASE_TAG: ${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref_name }}
       SOURCE_REF: ${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref }}
@@ -100,6 +115,7 @@ jobs:
     name: Windows x86_64 UCRT artifact
     runs-on: ubuntu-24.04
     container: debian:trixie
+    needs: validate
     env:
       RELEASE_TAG: ${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref_name }}
       SOURCE_REF: ${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref }}
diff --git a/notes/release-ci-artifacts.md b/notes/release-ci-artifacts.md
@@ -0,0 +1,21 @@
+# Release and platform CI artifacts
+
+2026-07-01:
+- Rolling-release packaging now validates `b<major>.<minor>.<patch>` tags before
+  artifact jobs and keeps Linux, macOS x86_64 target 13.0, and Windows UCRT
+  archive creation behind `tools/release/build_artifact.sh`.
+- Release archives are built from `make install DESTDIR` staging trees. The
+  archive checks remain release-only, including macOS/Windows binary checks via
+  the release harness and optional Darling/Wine runners.
+- Normal GitHub CI now uses `tools/ci/platform_build.sh` for each platform and
+  only builds plus runs a direct platform smoke (`jit.os`, `jit.arch`, and the
+  threading module). It does not run the release archive harness or stock
+  semantics suites.
+- CI and release jobs install/use stock `luajit` for the Lua test harness. The
+  local host currently has `/usr/bin/luajit` from the Debian package.
+- Local verification:
+  - `bash -n tools/release/build_artifact.sh tools/ci/platform_build.sh`;
+  - `tools/ci/platform_build.sh linux-x86_64`;
+  - `tools/release/build_artifact.sh linux-x86_64 b0.0.0 /tmp/lj-lockless-release-smoke`;
+  - `LUA=luajit tools/ci/lua_test.sh --list` shows all release binary/archive
+    cases.
diff --git a/tools/ci/platform_build.sh b/tools/ci/platform_build.sh
@@ -38,23 +38,69 @@ build_make() {
   make -C "$root" -j"$jobs" "$@"
 }
 
-run_release_binary_check() {
-  local check=$1
-  shift
-  env LJ_RELEASE_RUN_STOCK=0 "$@" "$root/tools/ci/lua_test.sh" "$check"
+smoke_code='print(jit.os, jit.arch); local threading = require("threading"); assert(type(threading.spawn) == "function"); assert(type(threading.gcstats) == "function")'
+
+assert_platform_output() {
+  local label=$1
+  local out=$2
+  local osname=$3
+  if ! printf '%s\n' "$out" |
+      grep -Eq "(^|[[:space:]])${osname}[[:space:]]+x64($|[[:space:]])"; then
+    printf '%s\n' "$out" >&2
+    printf 'CI %s smoke did not report %s x64\n' "$label" "$osname" >&2
+    exit 1
+  fi
+}
+
+run_direct_smoke() {
+  local label=$1
+  local bin=$2
+  local osname=$3
+  local out
+  if [ ! -x "$bin" ]; then
+    printf 'CI %s smoke binary is not executable: %s\n' "$label" "$bin" >&2
+    exit 1
+  fi
+  if ! out=$("$bin" -e "$smoke_code" 2>&1); then
+    printf '%s\n' "$out" >&2
+    exit 1
+  fi
+  assert_platform_output "$label" "$out" "$osname"
+  printf 'CI %s binary smoke passed\n' "$label"
+}
+
+run_windows_smoke() {
+  local bin=$1
+  local runner=${LJ_CI_WINDOWS_RUNNER:-${LJ_RELEASE_WINDOWS_RUNNER:-wine}}
+  local out
+  if [ ! -f "$bin" ]; then
+    printf 'CI Windows smoke binary is missing: %s\n' "$bin" >&2
+    exit 1
+  fi
+  if ! command -v "$runner" >/dev/null 2>&1; then
+    printf 'CI Windows smoke runner is not in PATH: %s\n' "$runner" >&2
+    exit 1
+  fi
+  if ! out=$(WINEDEBUG=-all "$runner" "$bin" -e "$smoke_code" 2>&1); then
+    printf '%s\n' "$out" >&2
+    exit 1
+  fi
+  assert_platform_output "Windows" "$out" "Windows"
+  printf 'CI Windows binary smoke passed\n'
 }
 
 case "$platform" in
   linux-x86_64)
     make_clean
     build_make
-    run_release_binary_check release_linux_binary \
-      LJ_RELEASE_REQUIRE=linux \
-      LJ_RELEASE_LINUX_BIN="$root/src/luajit"
+    run_direct_smoke "Linux" "$root/src/luajit" "Linux"
     ;;
   macos-x86_64)
     export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-13.0}
-    macos_make_args=(TARGET_SYS=Darwin)
+    macos_make_args=(
+      TARGET_SYS=Darwin
+      TARGET_FLAGS="${LJ_CI_MACOS_TARGET_FLAGS:-${LJ_RELEASE_MACOS_TARGET_FLAGS:--arch x86_64}}"
+    )
     if [ -n "${LJ_CI_MACOS_CC:-${LJ_RELEASE_MACOS_CC:-}}" ]; then
       macos_make_args+=(CC="${LJ_CI_MACOS_CC:-${LJ_RELEASE_MACOS_CC:-}}")
     fi
@@ -66,9 +112,7 @@ case "$platform" in
     fi
     make_clean
     build_make "${macos_make_args[@]}"
-    run_release_binary_check release_macos_binary \
-      LJ_RELEASE_REQUIRE=macos \
-      LJ_RELEASE_MACOS_BIN="$root/src/luajit"
+    run_direct_smoke "macOS" "$root/src/luajit" "OSX"
     ;;
   windows-x86_64-ucrt)
     cross=${LJ_CI_WINDOWS_CROSS:-${LJ_RELEASE_WINDOWS_CROSS:-x86_64-w64-mingw32ucrt-}}
@@ -81,9 +125,6 @@ case "$platform" in
     )
     make_clean
     build_make "${windows_make_args[@]}"
-    run_release_binary_check release_windows_binary \
-      LJ_RELEASE_REQUIRE=windows \
-      LJ_RELEASE_WINDOWS_BIN="$root/src/luajit.exe" \
-      LJ_RELEASE_WINDOWS_RUNNER="${LJ_RELEASE_WINDOWS_RUNNER:-wine}"
+    run_windows_smoke "$root/src/luajit.exe"
     ;;
 esac
diff --git a/tools/release/build_artifact.sh b/tools/release/build_artifact.sh
@@ -40,6 +40,9 @@ case "$platform" in
   *) usage ;;
 esac
 
+mkdir -p "$out_dir"
+out_dir=$(CDPATH= cd -- "$out_dir" && pwd)
+
 pkg="LuaJITMT-${tag}-${platform}"
 stage="${stage_parent}/${pkg}"
 
@@ -52,7 +55,6 @@ cleanup() {
 }
 trap cleanup EXIT
 
-mkdir -p "$out_dir"
 rm -rf "$stage"
 
 make_clean() {
@@ -172,7 +174,10 @@ case "$platform" in
     ;;
   macos-x86_64)
     export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-13.0}
-    macos_make_args=(TARGET_SYS=Darwin)
+    macos_make_args=(
+      TARGET_SYS=Darwin
+      TARGET_FLAGS="${LJ_RELEASE_MACOS_TARGET_FLAGS:--arch x86_64}"
+    )
     if [ -n "${LJ_RELEASE_MACOS_CC:-}" ]; then
       macos_make_args+=(CC="$LJ_RELEASE_MACOS_CC")
     fi
@@ -187,6 +192,8 @@ case "$platform" in
     make -C "$root" install DESTDIR="$stage" PREFIX="$prefix" \
       "${macos_make_args[@]}"
     install_doc "${stage}${prefix}/share/doc/luajitmt" "make install DESTDIR prefix tree"
+    printf 'macos_deployment_target: %s\n' "$MACOSX_DEPLOYMENT_TARGET" \
+      >> "${stage}${prefix}/share/doc/luajitmt/BUILDINFO"
     run_release_test
     archive=$(archive_stage)
     run_release_archive_test "$archive"
