feat: new ambuild system, compile against latest sdk

.github/workflows/ci.yml

@@ -1,19 +1,116 @@
-name: Build AlliedModders Extension
+name: CI
 
-on:
+on: [push, pull_request, workflow_dispatch]
-  push:
-    branches:
-      - master
-      - main
-    tags:
-      - "*"
-  pull_request:
-    branches:
-      - master
-      - main
 
 jobs:
-  build-release-extension:
+  build:
-    uses: srcdslab/ci-workflows/.github/workflows/shared_build_release_am_extension.yml@v1
+    name: Build
-    with:
+    runs-on: ${{ matrix.os }}
-      sdks: "css"
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04]
+        sourcemod-version: [1.11-dev]
+        include:
+          - os: ubuntu-20.04
+            target-archs: x86,x86_64
+            sdks: css
+
+    steps:
+      - name: Install Linux packages
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt update
+          sudo apt install -yq --no-install-recommends g++-multilib
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          path: extension
+
+      - name: Checkout SourceMod
+        uses: actions/checkout@v2
+        with:
+          repository: alliedmodders/sourcemod
+          ref: ${{ matrix.sourcemod-version }}
+          path: sourcemod
+          submodules: recursive
+
+      - name: Checkout AMBuild
+        uses: actions/checkout@v2
+        with:
+          repository: alliedmodders/ambuild
+          path: ambuild
+
+      - name: Checkout sm-ext-common
+        uses: actions/checkout@v2
+        with:
+          repository: srcdslab/sm-ext-common
+          path: sourcemod/extensions/sm-ext-common
+
+      - name: Install sourcemod dependencies
+        run: |
+          bash sourcemod/tools/checkout-deps.sh -m -s ${{ matrix.sdks }}
+
+      - name: Install AMBuild
+        uses: BSFishy/pip-action@v1
+        with:
+          packages: ./ambuild
+
+      - name: Build
+        working-directory: extension
+        shell: bash
+        env:
+          BREAKPAD_SYMBOL_SERVER: ${{ secrets.BREAKPAD_SYMBOL_SERVER }}
+        run: |
+          mkdir build && cd build
+          python ../configure.py --enable-optimize --targets=${{ matrix.target-archs }} --sdks=${{ matrix.sdks }}
+          ambuild
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ runner.os }}
+          path: extension/build/package
+
+
+  release:
+    name: Release
+    if: startsWith(github.ref, 'refs/tags/')
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v2
+
+      - name: Package
+        run: |
+          version=`echo $GITHUB_REF | sed "s/refs\/tags\///"`
+          ls -Rall
+          if [ -d "./Linux/" ]; then
+            cd ./Linux/
+            tar -czf ../${{ github.event.repository.name }}-${version}-linux.tar.gz -T <(\ls -1)
+            cd -
+          fi
+          if [ -d "./macOS/" ]; then
+            cd ./macOS/
+            tar -czf ../${{ github.event.repository.name }}-${version}-mac.tar.gz -T <(\ls -1)
+            cd -
+          fi
+          if [ -d "./Windows/" ]; then
+            cd ./Windows/
+            tar -czf ../${{ github.event.repository.name }}-${version}-windows.tar.gz -T <(\ls -1)
+            cd -
+          fi
+
+      - name: Release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: '*.tar.gz'
+          tag: ${{ github.ref }}
+          file_glob: true

.github/workflows/dependabot-auto-merge.yml

@@ -1,24 +0,0 @@
-name: Dependabot auto-merge
-
-on:
-  pull_request_target:
-    branches:
-      - master
-      - main
-    types:
-      - opened
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  enableAutoMerge:
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.user.login == 'dependabot[bot]'
-    steps:
-      - name: Enable auto-merge for Dependabot PRs
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{ github.event.pull_request.html_url }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -2,6 +2,3 @@ build
 Containerfile
 .venv
 safetyhook
-ambuild
-*.env
-*.ps1

src/AMBuilder

@@ -5,26 +5,21 @@ projectName = 'sendsnapshotfixer'
 
 project = builder.LibraryProject(projectName)
 project.sources += [
-    os.path.join(Extension.ext_root, 'src', 'extension.cpp'),
+  os.path.join(Extension.ext_root, 'src', 'extension.cpp'),
-    os.path.join(Extension.sm_root, 'public', 'smsdk_ext.cpp')
+  os.path.join(Extension.sm_root, 'public', 'smsdk_ext.cpp')
 ]
 
 for sdk_name in Extension.sdks:
-    sdk = Extension.sdks[sdk_name]
+  sdk = Extension.sdks[sdk_name]
-    if sdk['name'] in ['mock']:
+  if sdk['name'] in ['mock']:
-        continue
+    continue
 
-    for cxx in builder.targets:
+  for cxx in builder.targets:
-        if not cxx.target.arch in sdk['platforms'][cxx.target.platform]:
+    if not cxx.target.arch in sdk['platforms'][cxx.target.platform]:
-            continue
+      continue
 
-        binary = Extension.HL2ExtConfig(project, builder, cxx, projectName + '.ext.' + sdk['extension'], sdk)
+    binary = Extension.HL2ExtConfig(project, builder, cxx, projectName + '.ext.' + sdk['extension'], sdk)
 
-        Extension.AddCDetour(binary)
+    Extension.AddCDetour(binary)
-
-        # Silence fatal errors on unrecognized Clang warning flags from CDetour
-        if cxx.family in ['gcc', 'clang']:
-            binary.compiler.cflags += ['-Wno-unknown-warning-option']
-            binary.compiler.cxxflags += ['-Wno-unknown-warning-option']
 
 Extension.extensions += builder.Add(project)