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

[internal] improve AppVeyor build handling

* Also fix some typos
This commit is contained in:
Pete Batard 2018-06-24 13:53:31 +01:00
parent faebe1040f
commit 16cddefff9
4 changed files with 26 additions and 17 deletions

View file

@ -3,7 +3,7 @@ o Version 3.1 (2018.06.19)
Fix text being truncated on some dialogs (mostly Russian and Thai)
Add detection & warning about the 'Controlled Folder Access' Windows 10 feature
Improve retry attempts for transient errors
Increase size of the ESP to 300MB, for Windows To Go drives using GPT
Increase size of the ESP to 300MB, for Windows To Go drives partitioned as GPT
Update GRUB 2.0 and Grub4DOS to latest
Update libcdio to latest

View file

@ -1,15 +1,9 @@
os: Visual Studio 2017
init:
# Set the AppVeyor build version number to our tag or, if untagged, to the commit hash
# See https://github.com/appveyor/ci/issues/691
# Also include the build number, to distinguish between rebuilds of the same commit
- ps: |
if ($env:APPVEYOR_REPO_TAG -eq "true") {
Update-AppveyorBuild -Version "$($env:APPVEYOR_REPO_TAG_NAME)_#$env:APPVEYOR_BUILD_NUMBER"
} else {
Update-AppveyorBuild -Version "dev-$($env:APPVEYOR_REPO_COMMIT.Substring(0,8))_#$env:APPVEYOR_BUILD_NUMBER"
}
max_jobs: 4
# May choose to enable the following if we get tired of seeing double AppVeyor builds for tagged and untagged
# skip_non_tags: true
skip_commits:
# Don't run AppVeyor for commits that only modify resource or non-code files
@ -51,6 +45,21 @@ environment:
COMPILER: Coverity
PLATFORM: x86_32
init:
# Set the AppVeyor build version number to our tag or, if untagged, to the commit hash
# See https://github.com/appveyor/ci/issues/691
# Also include the build number, to distinguish between rebuilds of the same commit
- ps: |
if ($env:APPVEYOR_REPO_TAG -eq "true") {
Update-AppveyorBuild -Version "$($env:APPVEYOR_REPO_TAG_NAME)_#$env:APPVEYOR_BUILD_NUMBER";
} else {
Update-AppveyorBuild -Version "dev-$($env:APPVEYOR_REPO_COMMIT.Substring(0,8))_#$env:APPVEYOR_BUILD_NUMBER";
if ("$env:APPVEYOR_REPO_NAME" -eq "pbatard/rufus" -and "$env:APPVEYOR_REPO_BRANCH" -eq "master") {
Write-Output "Not running dev-build since we expect a tagged commit.";
Exit-AppVeyorBuild;
}
}
build:
project: rufus.sln
parallel: true

View file

@ -2,7 +2,7 @@
# -*- coding=utf-8 -*-
# LIMITATIONS
# this script was written as fast as possbile so it is broken/minimalistic:
# this script was written as fast as possible so it is broken/minimalistic:
# it assumes the first language in rufus.loc in English
# written for 1.0.23, things may have changes since then
# horrible code below

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.1320"
CAPTION "Rufus 3.1.1321"
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,1320,0
PRODUCTVERSION 3,1,1320,0
FILEVERSION 3,1,1321,0
PRODUCTVERSION 3,1,1321,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.1320"
VALUE "FileVersion", "3.1.1321"
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.1320"
VALUE "ProductVersion", "3.1.1321"
END
END
BLOCK "VarFileInfo"