mirror of
https://github.com/s1lentq/ReGameDLL_CS.git
synced 2025-07-21 12:46:22 +03:00
ci-build updated
+ added signing + migrated to windows-2025 runner + wmic deprecated and migrated to ps
This commit is contained in:
parent
8d5aa54ceb
commit
61c361e96c
165
.github/workflows/build.yml
vendored
165
.github/workflows/build.yml
vendored
@ -5,16 +5,18 @@ on:
|
||||
branches: [master]
|
||||
paths-ignore:
|
||||
- '**.md'
|
||||
- '.github/**'
|
||||
|
||||
pull_request:
|
||||
types: [opened, reopened, synchronize]
|
||||
release:
|
||||
types: [published]
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
windows:
|
||||
name: 'Windows'
|
||||
runs-on: windows-2019
|
||||
runs-on: windows-2025
|
||||
|
||||
env:
|
||||
solution: 'msvc/ReGameDLL.sln'
|
||||
@ -34,12 +36,48 @@ jobs:
|
||||
|
||||
- name: Setup MSBuild
|
||||
uses: microsoft/setup-msbuild@v2
|
||||
with:
|
||||
vs-version: '16'
|
||||
|
||||
# TODO: add support of 141_xp toolchain at VS2022+
|
||||
# - name: Install v140, v141 and v142 toolsets
|
||||
# shell: cmd
|
||||
# run: |
|
||||
# "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" modify ^
|
||||
# --installPath "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" ^
|
||||
# --add Microsoft.VisualStudio.Component.WindowsXP ^
|
||||
# --add Microsoft.VisualStudio.Component.VC.v140 ^
|
||||
# --add Microsoft.VisualStudio.Component.VC.v140.x86.x64 ^
|
||||
# --add Microsoft.VisualStudio.Component.VC.v140.xp ^
|
||||
# --add Microsoft.VisualStudio.Component.VC.140.CRT ^
|
||||
# --add Microsoft.VisualStudio.Component.VC.v141 ^
|
||||
# --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 ^
|
||||
# --add Microsoft.VisualStudio.Component.VC.v141.xp ^
|
||||
# --add Microsoft.VisualStudio.Component.VC.v142 ^
|
||||
# --add Microsoft.VisualStudio.Component.VC.v142.x86.x64 ^
|
||||
# --quiet --norestart
|
||||
|
||||
- name: Select PlatformToolset
|
||||
id: select_toolset
|
||||
shell: pwsh
|
||||
run: |
|
||||
$vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
|
||||
$vs2019 = & $vswhere -products * -version "[16.0,17.0)" -property installationPath -latest
|
||||
$vs2022 = & $vswhere -products * -version "[17.0,)" -property installationPath -latest
|
||||
|
||||
if ($vs2019) {
|
||||
"toolset=v140_xp" >> $env:GITHUB_OUTPUT
|
||||
Write-Host "Selected v140_xp toolset"
|
||||
} elseif ($vs2022) {
|
||||
"toolset=v143" >> $env:GITHUB_OUTPUT
|
||||
Write-Host "Selected v143 toolset"
|
||||
} else {
|
||||
Write-Error "No suitable Visual Studio installation found"
|
||||
exit 1
|
||||
}
|
||||
|
||||
- name: Build and Run unittests
|
||||
run: |
|
||||
msbuild ${{ env.solution }} -p:Configuration="${{ env.buildTests }}" /t:Clean,Build /p:Platform=${{ env.buildPlatform }} /p:PlatformToolset=v140_xp /p:XPDeprecationWarning=false
|
||||
$toolset = '${{ steps.select_toolset.outputs.toolset }}'
|
||||
msbuild ${{ env.solution }} -p:Configuration="${{ env.buildTests }}" /t:Clean,Build /p:Platform=${{ env.buildPlatform }} /p:PlatformToolset=$toolset /p:XPDeprecationWarning=false
|
||||
.\"msvc\Tests\mp.exe"
|
||||
If ($LASTEXITCODE -ne 0 -And
|
||||
$LASTEXITCODE -ne 3)
|
||||
@ -48,8 +86,13 @@ jobs:
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
msbuild ${{ env.solution }} -p:Configuration="${{ env.buildRelease }}" /t:Clean,Build /p:Platform=${{ env.buildPlatform }} /p:PlatformToolset=v140_xp /p:XPDeprecationWarning=false
|
||||
msbuild ${{ env.solution }} -p:Configuration="${{ env.buildReleasePlay }}" /t:Clean,Build /p:Platform=${{ env.buildPlatform }} /p:PlatformToolset=v140_xp /p:XPDeprecationWarning=false
|
||||
$toolset = '${{ steps.select_toolset.outputs.toolset }}'
|
||||
msbuild ${{ env.solution }} -p:Configuration="${{ env.buildRelease }}" /t:Clean,Build /p:Platform=${{ env.buildPlatform }} /p:PlatformToolset=$toolset /p:XPDeprecationWarning=false
|
||||
msbuild ${{ env.solution }} -p:Configuration="${{ env.buildReleasePlay }}" /t:Clean,Build /p:Platform=${{ env.buildPlatform }} /p:PlatformToolset=$toolset /p:XPDeprecationWarning=false
|
||||
- name: Get rcedit from chocolatey
|
||||
shell: pwsh
|
||||
run: |
|
||||
choco install rcedit -y
|
||||
|
||||
- name: Move files
|
||||
run: |
|
||||
@ -60,6 +103,49 @@ jobs:
|
||||
move msvc\${{ env.buildRelease }}\mp.dll publish\bin\win32\cstrike\dlls\mp.dll
|
||||
move msvc\${{ env.buildRelease }}\mp.pdb publish\debug\mp.pdb
|
||||
|
||||
- name: Get app version
|
||||
id: get_version
|
||||
shell: pwsh
|
||||
run: |
|
||||
$versionFile = "regamedll/version/appversion.h"
|
||||
if (-not (Test-Path $versionFile)) {
|
||||
Write-Error "Version file not found: $versionFile"
|
||||
exit 1
|
||||
}
|
||||
|
||||
$content = Get-Content $versionFile
|
||||
foreach ($line in $content) {
|
||||
if ($line -match '^\s*#define\s+APP_VERSION\s+"([^"]+)"') {
|
||||
$version = $matches[1]
|
||||
"version=$version" >> $env:GITHUB_OUTPUT
|
||||
Write-Host "Found version: $version"
|
||||
exit 0
|
||||
}
|
||||
}
|
||||
Write-Error "APP_VERSION not found in file"
|
||||
exit 1
|
||||
|
||||
- name: Show version
|
||||
run: echo "Version is ${{ steps.get_version.outputs.version }}"
|
||||
|
||||
- name: Import PFX and sign
|
||||
if: github.event_name != 'pull_request'
|
||||
env:
|
||||
KEY_PFX_PASS: ${{ secrets.KEY_PFX_PASS }}
|
||||
# https://github.com/actions/runner-images/blob/main/images/windows/Windows2025-Readme.md
|
||||
run: |
|
||||
$pfxBase64 = "${{ secrets.KEY_PFX_B64 }}"
|
||||
[IO.File]::WriteAllBytes("${{ github.workspace }}\signing-cert.pfx", [Convert]::FromBase64String($pfxBase64))
|
||||
certutil -f -p "${{ secrets.KEY_PFX_PASS }}" -importPFX "${{ github.workspace }}\signing-cert.pfx"
|
||||
& 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86\signtool.exe' sign /a /f "${{ github.workspace }}\signing-cert.pfx" /p $env:KEY_PFX_PASS /d "Regamedll_CS is a result of reverse engineering of original library mod HLDS (build 6153beta) using DWARF debug info embedded into linux version of HLDS, cs.so" /du "https://rehlds.dev/" /tr "http://timestamp.digicert.com" /td sha256 /fd sha256 /v ${{ github.workspace }}\publish\bin\win32\cstrike\dlls\mp.dll
|
||||
Remove-Item -Recurse -Force "${{ github.workspace }}\signing-cert.pfx"
|
||||
shell: "pwsh"
|
||||
|
||||
- name: Edit resources at windows binaries
|
||||
run: |
|
||||
rcedit ${{ github.workspace }}\publish\bin\win32\cstrike\dlls\mp.dll --set-version-string ProductName "Regamedll_CS - mp.dll" --set-file-version "${{ steps.get_version.outputs.version }}" --set-product-version "${{ steps.get_version.outputs.version }}" --set-version-string FileDescription "Regamedll_CS (mp.dll) - provide more stable (than official) version of Counter-Strike game with extended API for mods and plugins, Commit: $env:GITHUB_SHA" --set-version-string "Comments" "Regamedll_CS is a result of reverse engineering of original library mod HLDS (build 6153beta) using DWARF debug info embedded into linux version of HLDS, cs.so. Commit: $env:GITHUB_SHA" --set-version-string CompanyName "ReHLDS Dev Team" --set-version-string LegalCopyright "Copyright 2025 Valve, ReHLDS DevTeam" --set-icon regamedll/msvc/icon.ico
|
||||
shell: "pwsh"
|
||||
|
||||
- name: Deploy artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
@ -128,6 +214,49 @@ jobs:
|
||||
submodules: recursive
|
||||
fetch-depth: 0
|
||||
|
||||
- name: GPG Import
|
||||
run: |
|
||||
echo "${{ secrets.PUB_ASC }}" > "${{ secrets.PUB_ASC_FILE }}"
|
||||
echo "${{ secrets.KEY_ASC }}" > "${{ secrets.KEY_ASC_FILE }}"
|
||||
|
||||
# Import the public key
|
||||
gpg --batch --yes --import "${{ secrets.PUB_ASC_FILE }}"
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Error: Failed to import the public key"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Import the private key
|
||||
gpg --batch --yes --import "${{ secrets.KEY_ASC_FILE }}"
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Error: Failed to import the private key"
|
||||
exit 2
|
||||
fi
|
||||
|
||||
# Extract the fingerprint of the imported public key
|
||||
GPG_LINUX_FINGERPRINT=$(gpg --list-keys --with-colons | grep '^fpr' | head -n 1 | cut -d: -f10)
|
||||
|
||||
# Check if the fingerprint was extracted
|
||||
if [[ -z "$GPG_LINUX_FINGERPRINT" ]]; then
|
||||
echo "Error: Failed to extract the fingerprint of the key"
|
||||
exit 3
|
||||
fi
|
||||
|
||||
# Set the trust level for the key
|
||||
echo "$GPG_LINUX_FINGERPRINT:6:" | gpg --batch --import-ownertrust
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Error: Failed to set trust for the key $GPG_LINUX_FINGERPRINT"
|
||||
exit 4
|
||||
fi
|
||||
|
||||
echo "Key $GPG_LINUX_FINGERPRINT successfully imported and trusted"
|
||||
gpg --list-keys
|
||||
|
||||
#export for global use
|
||||
echo "GPG_LINUX_FINGERPRINT=$GPG_LINUX_FINGERPRINT" >> $GITHUB_ENV
|
||||
shell: bash
|
||||
if: github.event_name != 'pull_request'
|
||||
|
||||
- name: Build and Run unittests
|
||||
run: |
|
||||
rm -rf build && CC=gcc CXX=g++ cmake -DCMAKE_BUILD_TYPE=Unittests -B build && cmake --build build -j8
|
||||
@ -224,7 +353,29 @@ jobs:
|
||||
run: |
|
||||
rsync -a dist/ bin/win32/cstrike
|
||||
rsync -a dist/ bin/linux32/cstrike
|
||||
|
||||
# new runner, niw signs
|
||||
echo "${{ secrets.PUB_ASC }}" > "${{ secrets.PUB_ASC_FILE }}"
|
||||
echo "${{ secrets.KEY_ASC }}" > "${{ secrets.KEY_ASC_FILE }}"
|
||||
gpg --batch --yes --import "${{ secrets.PUB_ASC_FILE }}"
|
||||
gpg --batch --yes --import "${{ secrets.KEY_ASC_FILE }}"
|
||||
GPG_LINUX_FINGERPRINT=$(gpg --list-keys --with-colons | grep '^fpr' | head -n 1 | cut -d: -f10)
|
||||
echo "$GPG_LINUX_FINGERPRINT:6:" | gpg --batch --import-ownertrust
|
||||
echo "GPG_LINUX_FINGERPRINT=$GPG_LINUX_FINGERPRINT" >> $GITHUB_ENV
|
||||
|
||||
sign_file() {
|
||||
local file=$1
|
||||
gpg --batch --yes --detach-sign --armor -u "$GPG_LINUX_FINGERPRINT" "$file"
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Error: Failed to sign $file"
|
||||
exit 2
|
||||
fi
|
||||
echo "$file signed successfully."
|
||||
}
|
||||
|
||||
# Pack and sign final archive
|
||||
7z a -tzip regamedll-bin-${{ env.APP_VERSION }}.zip bin/ cssdk/
|
||||
sign_file "regamedll-bin-${{ env.APP_VERSION }}.zip"
|
||||
|
||||
- name: Publish artifacts
|
||||
uses: softprops/action-gh-release@v2
|
||||
@ -235,6 +386,8 @@ jobs:
|
||||
with:
|
||||
files: |
|
||||
*.zip
|
||||
*.7z
|
||||
*.asc
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.API_TOKEN }}
|
||||
|
||||
|
@ -18,13 +18,32 @@ set commitURL=
|
||||
set commitCount=0
|
||||
set branch_name=master
|
||||
|
||||
for /f "delims=" %%a in ('wmic OS Get localdatetime ^| find "."') do set "dt=%%a"
|
||||
set "YYYY=%dt:~0,4%"
|
||||
set "MM=%dt:~4,2%"
|
||||
set "DD=%dt:~6,2%"
|
||||
set "hour=%dt:~8,2%"
|
||||
set "min=%dt:~10,2%"
|
||||
set "sec=%dt:~12,2%"
|
||||
for /f "tokens=*" %%i in ('powershell -NoProfile -Command ^
|
||||
"$now = Get-Date; Write-Output ('{0:yyyy}|{0:MM}|{0:dd}|{0:HH}|{0:mm}|{0:ss}' -f $now)"') do (
|
||||
for /f "tokens=1-6 delims=|" %%a in ("%%i") do (
|
||||
set "YYYY=%%a"
|
||||
set "MM=%%b"
|
||||
set "DD=%%c"
|
||||
set "hour=%%d"
|
||||
set "min=%%e"
|
||||
set "sec=%%f"
|
||||
)
|
||||
)
|
||||
|
||||
echo YYYY=%YYYY%
|
||||
echo MM=%MM%
|
||||
echo DD=%DD%
|
||||
echo hour=%hour%
|
||||
echo min=%min%
|
||||
echo sec=%sec%
|
||||
|
||||
:: for /f "delims=" %%a in ('wmic OS Get localdatetime ^| find "."') do set "dt=%%a"
|
||||
:: set "YYYY=%dt:~0,4%"
|
||||
:: set "MM=%dt:~4,2%"
|
||||
:: set "DD=%dt:~6,2%"
|
||||
:: set "hour=%dt:~8,2%"
|
||||
:: set "min=%dt:~10,2%"
|
||||
:: set "sec=%dt:~12,2%"
|
||||
|
||||
::
|
||||
:: Remove leading zero from MM (e.g 09 > 9)
|
||||
|
BIN
regamedll/msvc/icon.ico
Normal file
BIN
regamedll/msvc/icon.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 118 KiB |
Loading…
x
Reference in New Issue
Block a user