From 3a315e88c2b04fbdf06eb99f3f4dff43868895a2 Mon Sep 17 00:00:00 2001 From: "zer0.k" <61156310+zer0k-z@users.noreply.github.com> Date: Mon, 19 Dec 2022 18:15:45 +0100 Subject: [PATCH] Update MM:S version in CI, dependency checkout scripts and sample extensions (#1885) * Update MM:S version in CI, dependency checkout scripts and sample extensions * Update MM:S version in CI, dependency checkout scripts and sample extensions * Fix EOL problems --- .github/workflows/ci.yml | 2 +- public/sample_ext/AMBuildScript | 2 +- public/sample_ext_nosdk/AMBuildScript | 2 +- tools/checkout-deps.ps1 | 2 +- tools/checkout-deps.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17f5eca6..0af4471a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: DEPENDENCIES_FOLDER: dependencies DEPENDENCIES_ROOT: ${{ github.workspace }}/dependencies MYSQL_VERSION: '5.5' - MMSOURCE_VERSION: '1.10' + MMSOURCE_VERSION: '1.12' steps: - uses: actions/checkout@v3 with: diff --git a/public/sample_ext/AMBuildScript b/public/sample_ext/AMBuildScript index 59a3be3d..bf48ee50 100644 --- a/public/sample_ext/AMBuildScript +++ b/public/sample_ext/AMBuildScript @@ -118,7 +118,7 @@ class ExtensionConfig(object): if builder.options.mms_path: self.mms_root = builder.options.mms_path else: - self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10') + self.mms_root = ResolveEnvPath('MMSOURCE112', 'mmsource-1.12') if not self.mms_root: self.mms_root = ResolveEnvPath('MMSOURCE', 'metamod-source') if not self.mms_root: diff --git a/public/sample_ext_nosdk/AMBuildScript b/public/sample_ext_nosdk/AMBuildScript index 1834d528..54c9a1d0 100644 --- a/public/sample_ext_nosdk/AMBuildScript +++ b/public/sample_ext_nosdk/AMBuildScript @@ -55,7 +55,7 @@ class ExtensionConfig(object): if builder.options.mms_path: self.mms_root = builder.options.mms_path else: - self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10') + self.mms_root = ResolveEnvPath('MMSOURCE112', 'mmsource-1.12') if not self.mms_root: self.mms_root = ResolveEnvPath('MMSOURCE', 'metamod-source') if not self.mms_root: diff --git a/tools/checkout-deps.ps1 b/tools/checkout-deps.ps1 index 098acd12..234d6fb0 100644 --- a/tools/checkout-deps.ps1 +++ b/tools/checkout-deps.ps1 @@ -75,7 +75,7 @@ if (-not (Test-Path "sourcemod" -PathType Container)) Exit 1 } -Get-Repository -Name "mmsource-1.10" -Branch "master" -Repo "https://github.com/alliedmodders/metamod-source.git" +Get-Repository -Name "mmsource-1.12" -Branch "master" -Repo "https://github.com/alliedmodders/metamod-source.git" if (-not (Test-Path "hl2sdk-proxy-repo" -PathType Container)) { diff --git a/tools/checkout-deps.sh b/tools/checkout-deps.sh index fd18b524..34394e2e 100755 --- a/tools/checkout-deps.sh +++ b/tools/checkout-deps.sh @@ -115,7 +115,7 @@ checkout () fi } -name=mmsource-1.10 +name=mmsource-1.12 branch=master repo="https://github.com/alliedmodders/metamod-source" origin=