Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-02-17 19:19:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #761 from NicknineTheEagle/upload-fix

Browse Source 
Fixed uploading artifacts to S3
This commit is contained in:
NicknineTheEagle 2020-11-17 02:12:48 +03:00 committed by GitHub
commit d7bd5a2a2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/vs-win.yml vendored
View File

@ -61,6 +61,12 @@ jobs:
"Release/xmp-vgmstream.pdb"
)
Compress-Archive $cliFiles Release/test.zip -Force
Compress-Archive $fb2kFiles Release/foo_input_vgmstream.zip -Force
Move-Item Release/foo_input_vgmstream.zip Release/foo_input_vgmstream.fb2k-component -Force
Compress-Archive $cliPdbFiles Release/test.pdb.zip -Force
Compress-Archive $fb2kPdbFiles Release/foo_input_vgmstream.pdb.zip -Force
mkdir tmp/cli
mkdir tmp/fb2k
mkdir tmp/cli-p

25
build.ps1
View File

@ -1,7 +1,7 @@
[CmdletBinding()]
Param(
[Parameter(Position=0, mandatory=$true)]
[ValidateSet("Init", "Build", "Package")]
[ValidateSet("Init", "Build")]
[string]$Task
)
@ -11,8 +11,6 @@ Param(
$solution = "vgmstream_full.sln"
$vswhere = "dependencies/vswhere.exe"
$config = "/p:Configuration=Release"
$onAppveyor = ($env:APPVEYOR -eq "true")
$appveyorLoggerPath = "C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
function Unzip
{
@ -70,17 +68,6 @@ function Init
function Build
{
$commit = & git describe --always
if($onAppveyor) {
if($env:APPVEYOR_PULL_REQUEST_NUMBER) {
$prCommits = & git rev-list "$env:APPVEYOR_REPO_BRANCH.." --count
$prNum = ".PR$env:APPVEYOR_PULL_REQUEST_NUMBER.$prCommits"
}
if($env:APPVEYOR_REPO_BRANCH -ne "master") { $branch = ".$env:APPVEYOR_REPO_BRANCH" }
$version = "$commit$prNum$branch"
Update-AppveyorBuild -Version $version -errorAction SilentlyContinue
}
if(!(Test-Path $vswhere)) { Init }
$msbuild = & $vswhere -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe
@ -89,19 +76,11 @@ function Build
Write-Error "Unable to find MSBuild. Is Visual Studio installed?"
}
$logger = ""
if(Test-Path $appveyorLoggerPath) {
$logger = "/logger:$appveyorLoggerPath"
}
& $msbuild $solution $config $logger /m
Package
& $msbuild $solution $config /m
}
switch ($Task)
{
"Init" { Init }
"Build" { Build }
"Package" { Package }
}