From 5ee545cdcc125bd50d1aa7805b6e71bf11376793 Mon Sep 17 00:00:00 2001 From: Sebastian Staudt Date: Mon, 2 Feb 2015 21:34:12 +0100 Subject: [PATCH] Count all commits for build number MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … not just for the current minor version. This prevents clashes for x.y.0 versions that result in duplicate builds. --- Suitcase.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Suitcase.xcodeproj/project.pbxproj b/Suitcase.xcodeproj/project.pbxproj index ff7e038..828e84f 100644 --- a/Suitcase.xcodeproj/project.pbxproj +++ b/Suitcase.xcodeproj/project.pbxproj @@ -944,7 +944,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "gitDescribe=$(git describe --always)\n/usr/libexec/PlistBuddy -c \"Delete CFBundleShortVersionString\" Suitcase/Suitcase-Info.plist\n/usr/libexec/PlistBuddy -c \"Add CFBundleShortVersionString string $gitDescribe\" Suitcase/Suitcase-Info.plist\ngitLastTag=$(git describe --abbrev=0 | cut -d. -f1-2)\ngitCommitCount=$(git rev-list --count $gitLastTag.0..HEAD)\n/usr/libexec/PlistBuddy -c \"Delete CFBundleVersion\" Suitcase/Suitcase-Info.plist\n/usr/libexec/PlistBuddy -c \"Add CFBundleVersion string $gitLastTag.$gitCommitCount\" Suitcase/Suitcase-Info.plist"; + shellScript = "gitDescribe=$(git describe --always)\n/usr/libexec/PlistBuddy -c \"Delete CFBundleShortVersionString\" Suitcase/Suitcase-Info.plist\n/usr/libexec/PlistBuddy -c \"Add CFBundleShortVersionString string $gitDescribe\" Suitcase/Suitcase-Info.plist\ngitLastTag=$(git describe --abbrev=0 | cut -d. -f1-2)\ngitCommitCount=$(git rev-list --count HEAD)\n/usr/libexec/PlistBuddy -c \"Delete CFBundleVersion\" Suitcase/Suitcase-Info.plist\n/usr/libexec/PlistBuddy -c \"Add CFBundleVersion string $gitLastTag.$gitCommitCount\" Suitcase/Suitcase-Info.plist"; }; 029B08F5159262FF00BD6271 /* ShellScript */ = { isa = PBXShellScriptBuildPhase;