From 6365ecc60c2fef61d9f1f9d262aceb098fe712ea Mon Sep 17 00:00:00 2001 From: Jaex Date: Sat, 15 Oct 2022 22:22:57 +0300 Subject: [PATCH] Remove AppVeyor folder --- AppVeyor/after_build.ps1 | 4 ---- AppVeyor/before_build.ps1 | 6 ------ AppVeyor/install.ps1 | 11 ----------- appveyor.yml | 26 +++++++++++++++++++++++--- 4 files changed, 23 insertions(+), 24 deletions(-) delete mode 100644 AppVeyor/after_build.ps1 delete mode 100644 AppVeyor/before_build.ps1 delete mode 100644 AppVeyor/install.ps1 diff --git a/AppVeyor/after_build.ps1 b/AppVeyor/after_build.ps1 deleted file mode 100644 index 7afbcdc71..000000000 --- a/AppVeyor/after_build.ps1 +++ /dev/null @@ -1,4 +0,0 @@ -if ($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null) -{ - & "ShareX.Setup\bin\$env:CONFIGURATION\ShareX.Setup.exe" -AppVeyor "$env:CONFIGURATION" -} \ No newline at end of file diff --git a/AppVeyor/before_build.ps1 b/AppVeyor/before_build.ps1 deleted file mode 100644 index 0540a2fdf..000000000 --- a/AppVeyor/before_build.ps1 +++ /dev/null @@ -1,6 +0,0 @@ -if ($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null) -{ - Invoke-WebRequest "$env:APIKeys" -OutFile "ShareX.UploadersLib\APIKeys\APIKeysLocal.cs" -} - -nuget restore ShareX.sln \ No newline at end of file diff --git a/AppVeyor/install.ps1 b/AppVeyor/install.ps1 deleted file mode 100644 index c13776d79..000000000 --- a/AppVeyor/install.ps1 +++ /dev/null @@ -1,11 +0,0 @@ -$content = Get-Content "SharedAssemblyInfo.cs" -$match = [regex]::Match($content, 'AssemblyVersion\(\"(.+?)\"\)') -if ($match.Success) -{ - $env:AppVersion = $match.Groups[1].Value - Update-AppveyorBuild -Version "$env:AppVersion.$env:APPVEYOR_BUILD_NUMBER" -} -else -{ - $env:AppVersion = "1.0.0" -} \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 1f547be4f..88514c2e2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,15 +11,35 @@ environment: APIKeys: secure: oWmEefxkbok87VNVsrUuXKgNaM4+j+EW6FBLsXwCbv3OVHgFvT0M9k4891OvYXDsj0oLuEn0oZeaeV8RrRDHA87ap7oCyD5FQJaiZSTHgeE= install: -- ps: AppVeyor\install.ps1 +- ps: | + $content = Get-Content "SharedAssemblyInfo.cs" + $match = [regex]::Match($content, 'AssemblyVersion\(\"(.+?)\"\)') + if ($match.Success) + { + $env:AppVersion = $match.Groups[1].Value + Update-AppveyorBuild -Version "$env:AppVersion.$env:APPVEYOR_BUILD_NUMBER" + } + else + { + $env:AppVersion = "1.0.0" + } before_build: -- ps: AppVeyor\before_build.ps1 +- ps: | + if ($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null) + { + Invoke-WebRequest "$env:APIKeys" -OutFile "ShareX.UploadersLib\APIKeys\APIKeysLocal.cs" + } + nuget restore ShareX.sln build: project: ShareX.sln parallel: true verbosity: minimal after_build: -- ps: AppVeyor\after_build.ps1 +- ps: | + if ($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null) + { + & "ShareX.Setup\bin\$env:CONFIGURATION\ShareX.Setup.exe" -AppVeyor "$env:CONFIGURATION" + } artifacts: - path: ShareX-*-setup.exe name: Setup