SM 1.13 (API v9) support & housekeeping

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/build-extension.yml

@@ -10,6 +10,9 @@ on:
         required: true
       cxx:
         type: string
+      sourcemod-branch:
+        type: string
+        required: true
       upload:
         type: boolean
         required: false
@@ -22,81 +25,73 @@ on:
         type: boolean
         required: false
         default: false
-      cache-key:
-        type: string
-        required: true
-      cache-dir:
+      container:
         type: string
-        required: true
+        required: false
 
 jobs:
   build:
-    name: Accelerator Extension ${{ inputs.os }}-${{ inputs.cc }}
+    name: ${{ inputs.os }}-${{ inputs.cc }}
     runs-on: ${{ inputs.os }}
+    container: ${{ inputs.container }}
 
-    env:
-      SOURCEMOD: ${{ github.workspace }}/${{ inputs.cache-dir }}/sourcemod
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
-          submodules: true
+          submodules: recursive
 
-      - name: Retrieve the cache
-        id: cache
-        uses: actions/cache@v4
+      - name: SourceMod checkout
+        uses: actions/checkout@v7
         with:
-          path: ${{ inputs.cache-dir }}
-          key: ${{ inputs.cache-key }}
-          fail-on-cache-miss: true
-          enableCrossOsArchive: true
-
+          repository: alliedmodders/sourcemod
+          ref: ${{ inputs.sourcemod-branch }}
+          submodules: recursive
+          path: sourcemod
+          fetch-depth: 1
+
+      - name: Resolve SourceMod path
+        shell: bash
+        run: echo "SOURCEMOD=$GITHUB_WORKSPACE/sourcemod" >> $GITHUB_ENV
+
       - name: Linux dependencies
         if: startsWith(runner.os, 'Linux')
+        shell: bash
         run: |
-          sudo dpkg --add-architecture i386
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends \
+          dpkg --add-architecture i386
+          apt-get update
+          apt-get install -y --no-install-recommends \
             gcc-multilib g++-multilib libstdc++6 lib32stdc++6 \
             libc6-dev libc6-dev-i386 linux-libc-dev \
             linux-libc-dev:i386 lib32z1-dev \
-            zlib1g-dev:i386 zlib1g-dev ${{ inputs.cc }}
+            zlib1g-dev:i386 zlib1g-dev
 
-      - name: Select clang compiler
+      - name: Select compiler
         if: startsWith(runner.os, 'Linux')
+        shell: bash
         run: |
           echo "CC=${{ inputs.cc }}" >> $GITHUB_ENV
           echo "CXX=${{ inputs.cxx }}" >> $GITHUB_ENV
           ${{ inputs.cc }} --version
           ${{ inputs.cxx }} --version
 
-      - uses: actions/setup-python@v5
-        name: Setup Python 3.10
-        with:
-          python-version: '3.10'
-
       - name: Install AMBuild
+        if: ${{ inputs.container == '' }}
+        shell: bash
         run: |
-          python -m pip install --upgrade pip setuptools wheel
-          pip install ./${{ inputs.cache-dir }}/ambuild
-
-      - name: Build (Debug)
-        if: ${{ inputs.debug }}
-        run: |
-          mkdir -p build && cd build
-          python ../configure.py --enable-debug
-          ambuild
+          python3 -m pip install --upgrade pip setuptools wheel
+          python3 -m pip install git+https://github.com/alliedmodders/ambuild
 
-      - name: Build (Release)
-        if: not ${{ inputs.debug }}
+      - name: Build
+        shell: bash
         run: |
           mkdir -p build && cd build
-          python ../configure.py --enable-optimize
+          python3 ../configure.py ${{ inputs.debug && '--enable-debug' || '--enable-optimize' }}
           ambuild
 
       - name: Upload package
         if: ${{ inputs.upload }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ inputs.upload-artifact-name }}
-          path: build/package
+          path: build/package

.github/workflows/ci.yml

@@ -2,45 +2,56 @@ name: CI
 on:
   workflow_dispatch:
   workflow_call:
-    inputs:
-      release:
-        type: boolean
-        required: true
-        default: false
 
 jobs:
-  cache:
-    uses: ./.github/workflows/cache.yml
-
-  build-options:
-    runs-on: ubuntu-latest
-    outputs:
-      exclude: ${{ steps.set.outputs.exclude }}
-    steps:
-      - id: set
-        run: |
-          echo "exclude=[${{ inputs.release && '{"runners": { "upload": false } }' || '' }}]" >> $GITHUB_OUTPUT
-
-  build:
-    name: Build
-    needs: [ cache, build-options ]
+  sm112:
+    name: SM 1.12
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            cc: clang-22
+            cxx: clang++-22
+            container: 'ghcr.io/alliedmodders/build-containers/debian11-clang22:latest'
+            artifact: accelerator_sm112_linux
+          - os: windows-latest
+            cc: msvc
+            cxx: msvc
+            container: ''
+            artifact: accelerator_sm112_windows
+    uses: ./.github/workflows/build-extension.yml
+    with:
+      os: ${{ matrix.os }}
+      cc: ${{ matrix.cc }}
+      cxx: ${{ matrix.cxx }}
+      container: ${{ matrix.container }}
+      sourcemod-branch: '1.12-dev'
+      upload: true
+      upload-artifact-name: ${{ matrix.artifact }}
 
+  sm113:
+    name: SM 1.13
     strategy:
       fail-fast: false
       matrix:
-        runners: [ 
-          { os: ubuntu-22.04, cc: clang, cxx: clang++, upload: true, upload-artifact-name: accelerator_linux },
-          { os: ubuntu-latest, cc: clang, cxx: clang++, upload: false },
-          { os: windows-latest, cc: msvc, cxx: msvc, upload: true, upload-artifact-name: accelerator_windows }
-        ]
-        exclude: ${{ fromJson(needs.build-options.outputs.exclude) }}
-
+        include:
+          - os: ubuntu-latest
+            cc: clang-22
+            cxx: clang++-22
+            container: 'ghcr.io/alliedmodders/build-containers/debian11-clang22:latest'
+            artifact: accelerator_sm113_linux
+          - os: windows-latest
+            cc: msvc
+            cxx: msvc
+            container: ''
+            artifact: accelerator_sm113_windows
     uses: ./.github/workflows/build-extension.yml
     with:
-      os: ${{ matrix.runners.os }}
-      cc: ${{ matrix.runners.cc }}
-      cxx: ${{ matrix.runners.cxx }}
-      upload: ${{ matrix.runners.upload }}
-      upload-artifact-name: ${{ matrix.runners.upload-artifact-name }}
-      cache-key: ${{ needs.cache.outputs.key }}
-      cache-dir: ${{ needs.cache.outputs.dir }}
+      os: ${{ matrix.os }}
+      cc: ${{ matrix.cc }}
+      cxx: ${{ matrix.cxx }}
+      container: ${{ matrix.container }}
+      sourcemod-branch: 'master'
+      upload: true
+      upload-artifact-name: ${{ matrix.artifact }}

.github/workflows/pull_request.yml

@@ -8,5 +8,3 @@ on:
 jobs:
   main-ci:
     uses: ./.github/workflows/ci.yml
-    with:
-      release: false

.github/workflows/release.yml

@@ -8,35 +8,33 @@ on:
 jobs:
   main-ci:
     uses: ./.github/workflows/ci.yml
-    with:
-      release: true
 
   release:
-    permissions: write-all
+    permissions:
+      contents: read
     runs-on: ubuntu-latest
     needs: [ main-ci ]
 
     env:
       PROJECT: 'accelerator'
+      UPLOAD_PASSWORD: ${{ secrets.UPLOAD_PASSWORD }}
     steps:
-      - run: sudo apt-get install -y tree
-
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         name: Repository checkout
         with:
           fetch-depth: 0
           path: repository
-      
+
       - name: Download Linux release
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
-          name: accelerator_linux
+          name: accelerator_sm112_linux
           path: linux
 
       - name: Download Windows release
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
-          name: accelerator_windows
+          name: accelerator_sm112_windows
           path: windows
 
       - name: Zip release again
@@ -55,10 +53,11 @@ jobs:
           echo "LINUX_ZIP=${LINUX_ZIP}" >> $GITHUB_ENV
 
       - name: Upload release
+        if: env.UPLOAD_PASSWORD != ''
         shell: bash
         run: |
           echo "Begin upload for branch (${{ github.ref_name }})"
-          AUTHORIZATION="$(echo -n 'builds:${{ secrets.UPLOAD_PASSWORD }}' | base64)"
+          AUTHORIZATION="$(echo -n "builds:${UPLOAD_PASSWORD}" | base64)"
           echo "::add-mask::${AUTHORIZATION}"
 
           echo "Uploading ${{ env.WINDOWS_ZIP }}"
@@ -74,3 +73,15 @@ jobs:
             exit 1
           fi
           echo "Upload successful!"
+
+      - name: Upload Windows artifact
+        uses: actions/upload-artifact@v7
+        with:
+          path: ${{ env.WINDOWS_ZIP }}
+          archive: false
+
+      - name: Upload Linux artifact
+        uses: actions/upload-artifact@v7
+        with:
+          path: ${{ env.LINUX_ZIP }}
+          archive: false

AMBuildScript

@@ -111,7 +111,7 @@ class AcceleratorConfig(object):
     ]
 
     cxx.cxxflags += [
-      '-std=c++17',
+      '-std=c++20',
       '-fno-threadsafe-statics',
       '-Wno-non-virtual-dtor',
       '-Wno-overloaded-virtual',
@@ -128,7 +128,7 @@ class AcceleratorConfig(object):
 
     cxx.cxxflags += [
       '/EHsc',
-      '/std:c++17'
+      '/std:c++20'
     ]
 
     return
@@ -158,7 +158,8 @@ class AcceleratorConfig(object):
       os.path.join(self.sm_root, 'public', 'extensions'),
       os.path.join(self.sm_root, 'public', 'amtl', 'amtl'),
       os.path.join(self.sm_root, 'public', 'amtl'),
-      os.path.join(self.sm_root, 'sourcepawn', 'include')
+      os.path.join(self.sm_root, 'sourcepawn', 'include'),
+      os.path.join(self.sm_root, 'sourcepawn', 'vm')
     ]
 
   def link_libz(self, compiler, context):