From ccbf632a7c3e65f30a46a6838c336e5ceb4e90dc Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 22 Aug 2019 20:14:52 +0100 Subject: [PATCH] [internal] fix AppVeyor MinGW builds --- README.md | 1 + appveyor.yml | 94 +++++++++++++++++++++++++++------------------------- src/rufus.rc | 10 +++--- 3 files changed, 55 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index 3f4c998a..26a44694 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ Rufus: The Reliable USB Formatting Utility [![Build status](https://img.shields.io/appveyor/ci/pbatard/rufus.svg?style=flat-square)](https://ci.appveyor.com/project/pbatard/rufus) [![Coverity Scan Build Status](https://img.shields.io/coverity/scan/2172.svg?style=flat-square)](https://scan.coverity.com/projects/pbatard-rufus) [![Build contributors](https://img.shields.io/github/contributors/pbatard/rufus.svg?style=flat-square)](https://github.com/pbatard/rufus/graphs/contributors) +[![Release](https://img.shields.io/github/release-pre/pbatard/rufus.svg?style=flat-square)](https://github.com/pbatard/rufus/releases) [![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat-square)](https://www.gnu.org/licenses/gpl-3.0.en.html) ![Rufus logo](https://raw.githubusercontent.com/pbatard/rufus/master/res/icons/rufus-128.png) diff --git a/appveyor.yml b/appveyor.yml index 02d95df2..e5b9a4cb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,19 +1,16 @@ -# The image below must be enabled in the AppVeyor settings -image: Visual Studio 2019 - skip_commits: # Don't run AppVeyor for commits that only modify resource or non-code files files: - - .gitignore - - .gitattributes - - .github/ - - res/ - - '**/*.cmd' - - '**/*.md' - - '**/*.rc' - - '**/*.sh' - - '**/*.txt' - - '**/*.xml' + - .gitignore + - .gitattributes + - .github/ + - res/ + - '**/*.cmd' + - '**/*.md' + - '**/*.rc' + - '**/*.sh' + - '**/*.txt' + - '**/*.xml' environment: COVERITY_SCAN_PROJECT_NAME: "pbatard/rufus" @@ -23,38 +20,45 @@ environment: global: BITS: 32 matrix: - - CONFIGURATION: Debug - COMPILER: MSVC - PLATFORM: x86 - - CONFIGURATION: Debug - COMPILER: MSVC - PLATFORM: x64 - - CONFIGURATION: Release - COMPILER: MSVC - PLATFORM: x86 - - CONFIGURATION: Release - COMPILER: MSVC - PLATFORM: x64 - - CONFIGURATION: Release - COMPILER: MinGW - PLATFORM: i686 - - CONFIGURATION: Release - COMPILER: MinGW - PLATFORM: x86_64 - - CONFIGURATION: Release - COMPILER: Coverity - PLATFORM: x86 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + CONFIGURATION: Debug + COMPILER: MSVC + PLATFORM: x86 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + CONFIGURATION: Debug + COMPILER: MSVC + PLATFORM: x64 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + CONFIGURATION: Release + COMPILER: MSVC + PLATFORM: x86 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + CONFIGURATION: Release + COMPILER: MSVC + PLATFORM: x64 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + CONFIGURATION: Release + COMPILER: MinGW + PLATFORM: i686 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + CONFIGURATION: Release + COMPILER: MinGW + PLATFORM: x86_64 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + CONFIGURATION: Release + COMPILER: Coverity + PLATFORM: x86 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"; - } +# 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"; + } build: project: rufus.sln @@ -62,13 +66,13 @@ build: verbosity: detailed install: -- ps: | + ps: | if ($env:PLATFORM -eq "x86_64") { $env:BITS = 64 } build_script: -- ps: | + ps: | $APPVEYOR_LOGGER = "C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"; switch ($env:COMPILER) { MSVC { diff --git a/src/rufus.rc b/src/rufus.rc index ed884d7e..58ae79ae 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -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.7.1565" +CAPTION "Rufus 3.7.1566" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -394,8 +394,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,7,1565,0 - PRODUCTVERSION 3,7,1565,0 + FILEVERSION 3,7,1566,0 + PRODUCTVERSION 3,7,1566,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -413,13 +413,13 @@ BEGIN VALUE "Comments", "https://akeo.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.7.1565" + VALUE "FileVersion", "3.7.1566" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus-3.7.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.7.1565" + VALUE "ProductVersion", "3.7.1566" END END BLOCK "VarFileInfo"