From 4f2b79d9b1837fc15cb2245195dfc9bc2ecf2f54 Mon Sep 17 00:00:00 2001 From: Dolly132 <109222243+Dolly132@users.noreply.github.com> Date: Tue, 28 Jul 2026 16:11:24 +0300 Subject: [PATCH 1/5] feat(am-build): Add submodules key --- .github/workflows/shared_build_release_am_extension.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/shared_build_release_am_extension.yml b/.github/workflows/shared_build_release_am_extension.yml index da1e52b..67f6396 100644 --- a/.github/workflows/shared_build_release_am_extension.yml +++ b/.github/workflows/shared_build_release_am_extension.yml @@ -11,6 +11,11 @@ on: description: "Artifact path to download from previous jobs" default: "" type: string + submodules: + description: "Whether to checkout submodules (true, false, or recursive)" + default: "recursive" + type: string + jobs: build: @@ -32,7 +37,7 @@ jobs: steps: - uses: actions/checkout@v7 with: - submodules: true + submodules: ${{ inputs.submodules }} - name: Download artifact uses: actions/download-artifact@v8 From 43e5d6d2a9150b3ae455c614009094c70acc5c30 Mon Sep 17 00:00:00 2001 From: Dolly132 <109222243+Dolly132@users.noreply.github.com> Date: Sat, 1 Aug 2026 14:38:00 +0300 Subject: [PATCH 2/5] feat(am-build): Add sm-branch and mm-branch inputs --- .../workflows/shared_build_release_am_extension.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/shared_build_release_am_extension.yml b/.github/workflows/shared_build_release_am_extension.yml index 67f6396..b8bfc20 100644 --- a/.github/workflows/shared_build_release_am_extension.yml +++ b/.github/workflows/shared_build_release_am_extension.yml @@ -15,6 +15,14 @@ on: description: "Whether to checkout submodules (true, false, or recursive)" default: "recursive" type: string + sm-branch: + description: "The SourceMod Repository branch to compile the extension against" + default: "master" + type: string + mm-branch: + description: "The MetaMod Repository branch to compile the extension against" + default: "1.12-dev" + type: string jobs: @@ -53,8 +61,8 @@ jobs: cc: ${{ matrix.cc }} cxx: ${{ matrix.cxx }} ambuild-ref: 'master' - mm-ref: '1.12-dev' - sm-ref: 'master' + mm-ref: ${{ inputs.mm-branch }} + sm-ref: ${{ inputs.sm-branch }} hl2sdk-manifests-ref: 'master' sdks: ${{ inputs.sdks }} configure-path: '../sm-ext-common/configure.py' From 377b1253dcc30d426cf6da9a5c344daff34921dd Mon Sep 17 00:00:00 2001 From: Dolly132 <109222243+Dolly132@users.noreply.github.com> Date: Sat, 1 Aug 2026 14:45:46 +0300 Subject: [PATCH 3/5] Forgot to do something... --- .github/workflows/shared_build_release_am_extension.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/shared_build_release_am_extension.yml b/.github/workflows/shared_build_release_am_extension.yml index b8bfc20..d2321bb 100644 --- a/.github/workflows/shared_build_release_am_extension.yml +++ b/.github/workflows/shared_build_release_am_extension.yml @@ -71,7 +71,7 @@ jobs: - name: Upload package uses: actions/upload-artifact@v7 with: - name: ${{ matrix.os }} + name: ${{ matrix.os }}-sm-${{ inputs.sm-branch }} path: ${{ steps.ambuild.outputs.package-path }} if-no-files-found: error retention-days: 14 From 3674acbb3c98eae887f301d7c07aae42c62340e6 Mon Sep 17 00:00:00 2001 From: Dolly132 <109222243+Dolly132@users.noreply.github.com> Date: Sat, 1 Aug 2026 15:23:29 +0300 Subject: [PATCH 4/5] Try to make the shared workflow build sm.12 and master --- .../shared_build_release_am_extension.yml | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/shared_build_release_am_extension.yml b/.github/workflows/shared_build_release_am_extension.yml index d2321bb..eab06d5 100644 --- a/.github/workflows/shared_build_release_am_extension.yml +++ b/.github/workflows/shared_build_release_am_extension.yml @@ -15,23 +15,22 @@ on: description: "Whether to checkout submodules (true, false, or recursive)" default: "recursive" type: string - sm-branch: - description: "The SourceMod Repository branch to compile the extension against" - default: "master" - type: string mm-branch: description: "The MetaMod Repository branch to compile the extension against" default: "1.12-dev" type: string - jobs: build: strategy: + fail-fast: false matrix: os: - ubuntu-24.04 - windows-2022 + sm-branch: + - master + - 1.12-dev include: - os: ubuntu-24.04 cc: clang-14 @@ -39,8 +38,8 @@ jobs: - os: windows-2022 cc: msvc cxx: msvc - fail-fast: false - name: ${{ matrix.os }} - ${{ matrix.cc }} + + name: ${{ matrix.os }} (SM ${{ matrix.sm-branch }}) runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v7 @@ -62,16 +61,16 @@ jobs: cxx: ${{ matrix.cxx }} ambuild-ref: 'master' mm-ref: ${{ inputs.mm-branch }} - sm-ref: ${{ inputs.sm-branch }} + sm-ref: ${{ matrix.sm-branch }} hl2sdk-manifests-ref: 'master' sdks: ${{ inputs.sdks }} configure-path: '../sm-ext-common/configure.py' configure-additional-flags: '--enable-optimize --enable-auto-versioning --ext-root "../"' - name: Upload package - uses: actions/upload-artifact@v7 + uses: actions/upload-artifact@v4 with: - name: ${{ matrix.os }}-sm-${{ inputs.sm-branch }} + name: ${{ matrix.os }}-sm-${{ matrix.sm-branch }} path: ${{ steps.ambuild.outputs.package-path }} if-no-files-found: error retention-days: 14 @@ -88,9 +87,9 @@ jobs: path: ./gh-artifacts - name: Package artifacts + shell: bash working-directory: gh-artifacts run: | - version=`echo $GITHUB_REF | sed "s/refs\/tags\///"` for platform in *; do if [ -d "./$platform/" ]; then cd "./$platform/" From 9a9643efb2d218d3460ab233ee38a8955881922c Mon Sep 17 00:00:00 2001 From: Dolly132 <109222243+Dolly132@users.noreply.github.com> Date: Sat, 1 Aug 2026 15:28:55 +0300 Subject: [PATCH 5/5] change upload artifact version --- .github/workflows/shared_build_release_am_extension.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/shared_build_release_am_extension.yml b/.github/workflows/shared_build_release_am_extension.yml index eab06d5..7e797c9 100644 --- a/.github/workflows/shared_build_release_am_extension.yml +++ b/.github/workflows/shared_build_release_am_extension.yml @@ -68,7 +68,7 @@ jobs: configure-additional-flags: '--enable-optimize --enable-auto-versioning --ext-root "../"' - name: Upload package - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: ${{ matrix.os }}-sm-${{ matrix.sm-branch }} path: ${{ steps.ambuild.outputs.package-path }}