1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00

[internal] update AppVeyor build script and add Coverity support

* Also only apply a git tag if on the master branch
This commit is contained in:
Pete Batard 2018-06-18 15:47:32 +01:00
parent 9afd1d05dd
commit e4b7b9cfd6
3 changed files with 53 additions and 9 deletions

View file

@ -12,5 +12,8 @@
type -P git &>/dev/null || { echo "git command not found. Aborting." >&2; exit 1; }
TAGVER=`cat ./.tag`
git tag "b$TAGVER"
# Only apply a tag if we're dealing with the master branch
if [ "`git rev-parse --abbrev-ref HEAD`" == "master" ]; then
git tag "b$TAGVER"
fi
rm ./.tag

View file

@ -11,7 +11,18 @@ init:
Update-AppveyorBuild -Version "dev-$($env:APPVEYOR_REPO_COMMIT.Substring(0,8))_#$env:APPVEYOR_BUILD_NUMBER"
}
skip_commits:
# Don't bother running AppVeyor on commits that only modify resource or .md/.sh files
files:
- res/*
- '**/*.md'
- '**/*.sh'
environment:
COVERITY_SCAN_PROJECT_NAME: "pbatard/rufus"
COVERITY_SCAN_NOTIFICATION_EMAIL: "pete@akeo.ie"
COVERITY_SCAN_TOKEN:
secure: XZADvwlRFo57sBA54pBH2oVT/eR/OytZYY/sCKq61io=
global:
BITS: 32
matrix:
@ -33,6 +44,9 @@ environment:
- CONFIGURATION: Release
COMPILER: MinGW
PLATFORM: x86_64
- CONFIGURATION: Release
COMPILER: Coverity
PLATFORM: x86_32
build:
project: rufus.sln
@ -40,8 +54,35 @@ build:
verbosity: detailed
install:
- if [%PLATFORM%]==[x86_64] set BITS=64
- ps: |
if ($env:PLATFORM -eq "x86_64") {
$env:BITS = 64
}
build_script:
- if [%COMPILER%]==[MSVC] msbuild rufus.sln /m /p:Configuration=%CONFIGURATION%,Platform=%PLATFORM% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
- if [%COMPILER%]==[MinGW] C:\msys64\usr\bin\bash -lc "export PATH=/mingw%BITS%/bin:$PATH; cd /c/projects/rufus; ./configure --build=%PLATFORM%-w64-mingw32 --host=%PLATFORM%-w64-mingw32 --disable-debug; make -j4"
- ps: |
$APPVEYOR_LOGGER = "C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll";
switch ($env:COMPILER) {
MSVC {
msbuild rufus.sln /m /p:Configuration=$env:CONFIGURATION,Platform=$env:PLATFORM /l:$APPVEYOR_LOGGER;
}
MinGW {
C:\msys64\usr\bin\bash -lc "export PATH=/mingw$env:BITS/bin:`$PATH; cd /c/projects/rufus; mkdir -p m4; ./configure --build=$env:PLATFORM-w64-mingw32 --host=$env:PLATFORM-w64-mingw32 --disable-debug; make -j4";
}
Coverity {
$PUBLISHCOVERITY = "$env:APPVEYOR_BUILD_FOLDER\PublishCoverity\tools\PublishCoverity.exe";
if (!"$env:COVERITY_SCAN_TOKEN") {
Write-Output "Not running Coverity due to missing credential.";
return;
}
if ($env:APPVEYOR_REPO_TAG -eq "false") {
Write-Output "Not running Coverity due to missing tag.";
return;
}
& nuget install PublishCoverity -o "$env:APPVEYOR_BUILD_FOLDER" -excludeversion;
& cov-build.exe --dir cov-int msbuild rufus.sln /m /p:Configuration=$env:CONFIGURATION,Platform=$env:PLATFORM /l:$APPVEYOR_LOGGER;
& $PUBLISHCOVERITY compress --nologo -i "$env:APPVEYOR_BUILD_FOLDER\cov-int" -o "$env:APPVEYOR_BUILD_FOLDER\coverity.zip" --overwrite;
& $PUBLISHCOVERITY publish --nologo -t $env:COVERITY_SCAN_TOKEN -e $env:COVERITY_SCAN_NOTIFICATION_EMAIL -r $env:COVERITY_SCAN_PROJECT_NAME -z "$env:APPVEYOR_BUILD_FOLDER\coverity.zip" -d "Appveyor build." --codeVersion $env:APPVEYOR_BUILD_VERSION;
Get-ChildItem -Path ./ -Recurse | Remove-Item -Force -Recurse;
}
}

View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.1.1318"
CAPTION "Rufus 3.1.1319"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -389,8 +389,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,1,1318,0
PRODUCTVERSION 3,1,1318,0
FILEVERSION 3,1,1319,0
PRODUCTVERSION 3,1,1319,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -407,13 +407,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.1.1318"
VALUE "FileVersion", "3.1.1319"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.1.1318"
VALUE "ProductVersion", "3.1.1319"
END
END
BLOCK "VarFileInfo"