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
This commit is contained in:
parent
6c5a3fdaf2
commit
3a315e88c2
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -34,7 +34,7 @@ jobs:
|
|||||||
DEPENDENCIES_FOLDER: dependencies
|
DEPENDENCIES_FOLDER: dependencies
|
||||||
DEPENDENCIES_ROOT: ${{ github.workspace }}/dependencies
|
DEPENDENCIES_ROOT: ${{ github.workspace }}/dependencies
|
||||||
MYSQL_VERSION: '5.5'
|
MYSQL_VERSION: '5.5'
|
||||||
MMSOURCE_VERSION: '1.10'
|
MMSOURCE_VERSION: '1.12'
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
|
@ -118,7 +118,7 @@ class ExtensionConfig(object):
|
|||||||
if builder.options.mms_path:
|
if builder.options.mms_path:
|
||||||
self.mms_root = builder.options.mms_path
|
self.mms_root = builder.options.mms_path
|
||||||
else:
|
else:
|
||||||
self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10')
|
self.mms_root = ResolveEnvPath('MMSOURCE112', 'mmsource-1.12')
|
||||||
if not self.mms_root:
|
if not self.mms_root:
|
||||||
self.mms_root = ResolveEnvPath('MMSOURCE', 'metamod-source')
|
self.mms_root = ResolveEnvPath('MMSOURCE', 'metamod-source')
|
||||||
if not self.mms_root:
|
if not self.mms_root:
|
||||||
|
@ -55,7 +55,7 @@ class ExtensionConfig(object):
|
|||||||
if builder.options.mms_path:
|
if builder.options.mms_path:
|
||||||
self.mms_root = builder.options.mms_path
|
self.mms_root = builder.options.mms_path
|
||||||
else:
|
else:
|
||||||
self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10')
|
self.mms_root = ResolveEnvPath('MMSOURCE112', 'mmsource-1.12')
|
||||||
if not self.mms_root:
|
if not self.mms_root:
|
||||||
self.mms_root = ResolveEnvPath('MMSOURCE', 'metamod-source')
|
self.mms_root = ResolveEnvPath('MMSOURCE', 'metamod-source')
|
||||||
if not self.mms_root:
|
if not self.mms_root:
|
||||||
|
2
tools/checkout-deps.ps1
vendored
2
tools/checkout-deps.ps1
vendored
@ -75,7 +75,7 @@ if (-not (Test-Path "sourcemod" -PathType Container))
|
|||||||
Exit 1
|
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))
|
if (-not (Test-Path "hl2sdk-proxy-repo" -PathType Container))
|
||||||
{
|
{
|
||||||
|
2
tools/checkout-deps.sh
vendored
2
tools/checkout-deps.sh
vendored
@ -115,7 +115,7 @@ checkout ()
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
name=mmsource-1.10
|
name=mmsource-1.12
|
||||||
branch=master
|
branch=master
|
||||||
repo="https://github.com/alliedmodders/metamod-source"
|
repo="https://github.com/alliedmodders/metamod-source"
|
||||||
origin=
|
origin=
|
||||||
|
Loading…
Reference in New Issue
Block a user