From 903b1be80343dcd287046f2c910e02c0cf819e5f Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 27 Jul 2026 15:25:55 +0000 Subject: [PATCH 1/3] chore: upgrade AMX Mod X and shellcheck pins to latest Bump AMX Mod X from build 5478 to 5479 (latest downloadable build on amxxdrop 1.10). ReHLDS 3.15.0.896, ReGameDLL_CS 5.30.0.814, Metamod-R 1.3.0.149, and ReAPI 5.29.0.358 were verified against upstream and are already the latest releases; debian:trixie is the current Debian stable, so both build stages stay put. Bump the shellcheck pin in ci.yml from v0.10.0 to v0.11.0. Verified entrypoint.sh and install.sh are clean under 0.11.0's new checks (SC2327-SC2332, SC3062, SC2335) before bumping. Resync the README stack list, which still advertised ReHLDS 3.14.0.857 / ReGameDLL_CS 5.28.0.756 / ReAPI 5.26.0.338 rather than the versions the Containerfile actually pins. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01NAVdMb6TCFgkBdyh1Hdrme --- .github/workflows/ci.yml | 2 +- CHANGELOG.md | 3 +++ Containerfile | 2 +- README.md | 8 ++++---- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index daada83..b244d55 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,6 @@ jobs: - name: Lint shell scripts with shellcheck uses: ludeeus/action-shellcheck@2.0.0 with: - version: v0.10.0 + version: v0.11.0 scandir: . additional_files: entrypoint.sh install.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 27b24e2..715807d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ ## [Unreleased] ### Changed +- Bumped AMX Mod X pin from build 5478 to 5479 +- Bumped shellcheck pin in `ci.yml` from v0.10.0 to v0.11.0 +- README stack list resynced to the versions actually pinned in the Containerfile (ReHLDS 3.15.0.896, ReGameDLL_CS 5.30.0.814, ReAPI 5.29.0.358, AMX Mod X build 5479) - Migrated base images from Debian 12 (Bookworm) to Debian 13 (Trixie) in both builder and runtime stages - Pinned base image `FROM` lines to OCI manifest digests for fully reproducible builds - `amxxpc` now invoked with `-O2` optimisation flag; compile loop fails fast (`|| exit 1`) on any plugin error diff --git a/Containerfile b/Containerfile index bb9b7cf..83dd06d 100644 --- a/Containerfile +++ b/Containerfile @@ -11,7 +11,7 @@ ARG REHLDS_VERSION=3.15.0.896 ARG REGAMEDLL_VERSION=5.30.0.814 ARG METAMOD_VERSION=1.3.0.149 ARG REAPI_VERSION=5.29.0.358 -ARG AMXMODX_BUILD=5478 +ARG AMXMODX_BUILD=5479 # --------------------------------------------------------------------------- # Stage 1: Builder — SteamCMD + HLDS + ReHLDS stack diff --git a/README.md b/README.md index b5b2961..7520e3e 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ Containerized Counter-Strike 1.6 scoutzknivez server using the ReHLDS stack. ## Stack -- **ReHLDS** 3.14.0.857 — reverse-engineered engine -- **ReGameDLL_CS** 5.28.0.756 — reverse-engineered game DLL +- **ReHLDS** 3.15.0.896 — reverse-engineered engine +- **ReGameDLL_CS** 5.30.0.814 — reverse-engineered game DLL - **Metamod-R** 1.3.0.149 — plugin loader -- **AMX Mod X** 1.10 — scripting platform -- **ReAPI** 5.26.0.338 — extended API +- **AMX Mod X** 1.10.0 (build 5479) — scripting platform +- **ReAPI** 5.29.0.358 — extended API ## Install From 42e3c47e6079c28bc7e3301c0e304a2b27877139 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 27 Jul 2026 15:42:30 +0000 Subject: [PATCH 2/3] fix(ci): correct build-number ordering in version-check; drop stale CHANGELOG claim version-check.yml piped `sort -nu | sort -r`, so the second sort re-ordered the build numbers lexically and undid the numeric sort. Harmless at today's 4-digit AMX Mod X builds, but it would pick the wrong "latest" once builds reach 5 digits (ranking 9999 above 10000). Collapsed to a single `sort -nru`, which sorts numerically descending and dedupes in one pass. Removed the CHANGELOG line claiming base image FROM lines are pinned to OCI manifest digests. The digests were added in #11 and removed again in #15; both are still under [Unreleased], so the net diff has plain debian:trixie / trixie-slim tags and the entry described a change that no longer exists. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01NAVdMb6TCFgkBdyh1Hdrme --- .github/workflows/version-check.yml | 3 +-- CHANGELOG.md | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml index fc57d32..a2c586e 100644 --- a/.github/workflows/version-check.yml +++ b/.github/workflows/version-check.yml @@ -67,8 +67,7 @@ jobs: done < <( curl -fsSL "https://www.amxmodx.org/amxxdrop/1.10/" 2>/dev/null \ | grep -oP 'amxmodx-1\.10\.0-git\K[0-9]+(?=-base-linux\.tar\.gz)' \ - | sort -nu \ - | sort -r + | sort -nru ) if [ -z "$amxx_latest" ]; then echo "⚠ AMX Mod X: could not fetch latest downloadable build (current: ${amxx_current})" diff --git a/CHANGELOG.md b/CHANGELOG.md index 715807d..50f97a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,6 @@ - Bumped shellcheck pin in `ci.yml` from v0.10.0 to v0.11.0 - README stack list resynced to the versions actually pinned in the Containerfile (ReHLDS 3.15.0.896, ReGameDLL_CS 5.30.0.814, ReAPI 5.29.0.358, AMX Mod X build 5479) - Migrated base images from Debian 12 (Bookworm) to Debian 13 (Trixie) in both builder and runtime stages -- Pinned base image `FROM` lines to OCI manifest digests for fully reproducible builds - `amxxpc` now invoked with `-O2` optimisation flag; compile loop fails fast (`|| exit 1`) on any plugin error - Quadlet `Volume` paths updated from hardcoded `~/Development/cs-server/` to `~/.config/cs-server/` to match `install.sh` behaviour From 6ceec2611da87ae4a44b8d1106e0018b2a046d4d Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 27 Jul 2026 15:45:38 +0000 Subject: [PATCH 3/3] docs: drop inaccurate -O2 claim from CHANGELOG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The entry stated `amxxpc` is invoked with an `-O2` optimisation flag, but the Containerfile compile loop calls `./amxxpc "$sma"` with no such flag, and `git log -S'-O2' -- Containerfile` shows it was never there — the claim was never accurate rather than having regressed. Kept the fail-fast half of the entry, which is correct: both the compile and the mv carry `|| exit 1`. Left the build itself alone; adding `-O2` would change compiler behaviour and is out of scope here. Reported by Copilot review on #38. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01NAVdMb6TCFgkBdyh1Hdrme --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50f97a1..679ec01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ - Bumped shellcheck pin in `ci.yml` from v0.10.0 to v0.11.0 - README stack list resynced to the versions actually pinned in the Containerfile (ReHLDS 3.15.0.896, ReGameDLL_CS 5.30.0.814, ReAPI 5.29.0.358, AMX Mod X build 5479) - Migrated base images from Debian 12 (Bookworm) to Debian 13 (Trixie) in both builder and runtime stages -- `amxxpc` now invoked with `-O2` optimisation flag; compile loop fails fast (`|| exit 1`) on any plugin error +- AMX Mod X plugin compile loop fails fast (`|| exit 1`) on any plugin error - Quadlet `Volume` paths updated from hardcoded `~/Development/cs-server/` to `~/.config/cs-server/` to match `install.sh` behaviour ### Added