diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index 87f48f09a1..d6df684904 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -1515,7 +1515,9 @@ jobs: run: | [XML]$versionXML = Get-Content build/Version.props $tgsVersion = $versionXML.Project.PropertyGroup.TgsCoreVersion + $mariaDBVerison = $versionXML.Project.PropertyGroup.TgsMariaDBRedistVersion echo "TGS_VERSION=$tgsVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append + echo "MARIADB_VERSION=$mariaDBVerison" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append - name: Upload .msi uses: actions/upload-artifact@v3 @@ -1657,6 +1659,16 @@ jobs: asset_name: tgstation-server-v${{ env.TGS_VERSION }}.debian.packaging.tar.xz asset_content_type: application/x-tar + - name: Upload MariaDB .msi + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.DEV_PUSH_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/bin/Release/mariadb.msi + asset_name: mariadb-${{ env.MARIADB_VERSION }}-winx64.msi + asset_content_type: application/octet-stream + - name: Upload Installer .exe uses: actions/upload-release-asset@v1 env: diff --git a/build/Version.props b/build/Version.props index a0e852bce2..84866a730e 100644 --- a/build/Version.props +++ b/build/Version.props @@ -18,8 +18,6 @@ 6 https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/6.0.24/dotnet-hosting-6.0.24-win.exe - 10.11.5 - - https://atl.mirrors.knownhost.com/mariadb//mariadb-10.11.5/winx64-packages/mariadb-10.11.5-winx64.msi + 10.11.6 diff --git a/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Tgstation.Server.Host.Service.Wix.Bundle.wixproj b/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Tgstation.Server.Host.Service.Wix.Bundle.wixproj index 5f7032e3e5..827b40f156 100644 --- a/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Tgstation.Server.Host.Service.Wix.Bundle.wixproj +++ b/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Tgstation.Server.Host.Service.Wix.Bundle.wixproj @@ -1,7 +1,7 @@ - ProductVersion=$(TgsCoreVersion);NetMajorVersion=$(TgsNetMajorVersion);DotnetRedistUrl=$(TgsDotnetRedistUrl);MariaDBRedistUrl=$(TgsMariaDBRedistUrl) + ProductVersion=$(TgsCoreVersion);NetMajorVersion=$(TgsNetMajorVersion);DotnetRedistUrl=$(TgsDotnetRedistUrl);MariaDBRedistUrl=https://github.com/tgstation/tgstation-server/releases/download/tgstation-server-v$(TgsCoreVersion)/mariadb-$(TgsMariaDBRedistVersion)-winx64.msi Bundle x86 tgstation-server-installer diff --git a/build/package/winget/prepare_installer_input_artifacts.ps1 b/build/package/winget/prepare_installer_input_artifacts.ps1 index b2a5c6b4d7..8e25606a9d 100644 --- a/build/package/winget/prepare_installer_input_artifacts.ps1 +++ b/build/package/winget/prepare_installer_input_artifacts.ps1 @@ -13,7 +13,21 @@ try [XML]$versionXML = Get-Content build/Version.props -ErrorAction Stop $redistUrl = $versionXML.Project.PropertyGroup.TgsDotnetRedistUrl - $dbRedistUrl = $versionXML.Project.PropertyGroup.TgsMariaDBRedistUrl + + $dbRedistVersion = $versionXML.Project.PropertyGroup.TgsMariaDBRedistVersion + + $dbRedistMinorVersion = $dbRedistVersion.Substring(0, $dbRedistVersion.LastIndexOf(".")) + + $ProgressPreference = 'SilentlyContinue' + try + { + $json=Invoke-RestMethod -Uri "https://downloads.mariadb.org/rest-api/mariadb/${dbRedistMinorVersion}/" + } finally { + $ProgressPreference = $previousProgressPreference + } + + $msiFile = $json.releases.$dbRedistVersion.files | Where-Object { $_.package_type -eq "MSI Package" } | Select-Object -First 1 + $dbRedistUrl = $msiFile.file_download_url mkdir artifacts $previousProgressPreference = $ProgressPreference