Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/sequelpro/sequelpro
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmoagx
dmoagx committed Apr 17, 2016
2 parents 2b638f8 + 6ecd8ee commit a00f2a7
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 10 deletions.
27 changes: 26 additions & 1 deletion Resources/Plists/Info.plist
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -199,6 +199,31 @@
<key>x86_64</key> <key>x86_64</key>
<string>10.6.0</string> <string>10.6.0</string>
</dict> </dict>

<key>NSAppTransportSecurity</key>
<dict>
<key>NSExceptionDomains</key>
<dict>
<key>sequelpro.com</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<false/>
<key>NSExceptionRequiresForwardSecrecy</key>
<false/>
<key>NSExceptionMinimumTLSVersion</key>
<string>TLSv1.0</string>
<key>NSThirdPartyExceptionAllowsInsecureHTTPLoads</key>
<false/>
<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
<false/>
<key>NSThirdPartyExceptionMinimumTLSVersion</key>
<string>TLSv1.0</string>
<key>NSRequiresCertificateTransparency</key>
<false/>
</dict>
</dict>
</dict>

<key>NSAppleScriptEnabled</key> <key>NSAppleScriptEnabled</key>
<true/> <true/>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
Expand Down Expand Up @@ -240,7 +265,7 @@
<key>SUEnableSystemProfiling</key> <key>SUEnableSystemProfiling</key>
<true/> <true/>
<key>SUFeedURL</key> <key>SUFeedURL</key>
<string>https://www.sequelpro.com/appcast/app-releases.xml</string> <string>https://sequelpro.com/appcast/app-releases.xml</string>
<key>SUPublicDSAKeyFile</key> <key>SUPublicDSAKeyFile</key>
<string>sparkle-public-key.pem</string> <string>sparkle-public-key.pem</string>
<key>UTExportedTypeDeclarations</key> <key>UTExportedTypeDeclarations</key>
Expand Down
18 changes: 9 additions & 9 deletions Scripts/nightlybuildscript.sh
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ NIGHTLY_KEYCHAIN_PASSWORD='PASSWORD NOT COMMITTED'
REVISION_HASH=`echo "$1" | grep "\([0-9a-f]*\)"` REVISION_HASH=`echo "$1" | grep "\([0-9a-f]*\)"`
if [ "$REVISION_HASH" == "" ] if [ "$REVISION_HASH" == "" ]
then then
echo "Unable to extract revision hash from first argument; cancelling nightly build." >&2 echo "Unable to extract revision hash from first argument; cancelling nightly build (git rev-parse HEAD)." >&2
exit 1 exit 1
fi fi
SHORT_HASH=${REVISION_HASH:0:10} SHORT_HASH=${REVISION_HASH:0:10}
Expand Down Expand Up @@ -90,10 +90,10 @@ find languagetranslations/Resources \( -name "*.lproj" \) | while read FILE; do
cp -R "$FILE" "Sequel Pro.app/Contents/Resources/" cp -R "$FILE" "Sequel Pro.app/Contents/Resources/"
done done


echo "Copying nightly icon" #echo "Copying nightly icon"


# Copy in the nightly icon # Copy in the nightly icon
cp -f "$NIGHTLY_ICON_LOC" Sequel\ Pro.app/Contents/Resources/appicon.icns #cp -f "$NIGHTLY_ICON_LOC" Sequel\ Pro.app/Contents/Resources/appicon.icns


echo "Updating version strings" echo "Updating version strings"


Expand All @@ -103,7 +103,7 @@ php -r '$infoplistloc = "'$BUILD_DIR'/Sequel Pro.app/Contents/Info.plist";
$infoplist = preg_replace("/(\<key\>CFBundleShortVersionString\<\/key\>\s*\n?\r?\s*\<string\>)[^<]*(\<\/string\>)/i", "\\1Nightly build for revision '$SHORT_HASH'\\2", $infoplist); $infoplist = preg_replace("/(\<key\>CFBundleShortVersionString\<\/key\>\s*\n?\r?\s*\<string\>)[^<]*(\<\/string\>)/i", "\\1Nightly build for revision '$SHORT_HASH'\\2", $infoplist);
$infoplist = preg_replace("/(\<key\>CFBundleVersion\<\/key\>\s*\n?\r?\s*)\<string\>[^<]*(\<\/string\>)/i", "\\1<string>'$NUMERIC_REVISION'\\2", $infoplist); $infoplist = preg_replace("/(\<key\>CFBundleVersion\<\/key\>\s*\n?\r?\s*)\<string\>[^<]*(\<\/string\>)/i", "\\1<string>'$NUMERIC_REVISION'\\2", $infoplist);
$infoplist = preg_replace("/(\<key\>NSHumanReadableCopyright\<\/key\>\s*\n?\r?\s*\<string\>)[^<]*(\<\/string\>)/i", "\\1Nightly build for revision '$SHORT_HASH'\\2", $infoplist); $infoplist = preg_replace("/(\<key\>NSHumanReadableCopyright\<\/key\>\s*\n?\r?\s*\<string\>)[^<]*(\<\/string\>)/i", "\\1Nightly build for revision '$SHORT_HASH'\\2", $infoplist);
$infoplist = preg_replace("/(\<key\>SUFeedURL\<\/key\>\s*\n?\r?\s*\<string\>)[^<]*(\<\/string\>)/i", "\\1http://nightly.sequelpro.com/nightly-app-releases.php\\2", $infoplist); $infoplist = preg_replace("/(\<key\>SUFeedURL\<\/key\>\s*\n?\r?\s*\<string\>)[^<]*(\<\/string\>)/i", "\\1https://sequelpro.com/nightly/nightly-app-releases.php\\2", $infoplist);
file_put_contents($infoplistloc, $infoplist);' file_put_contents($infoplistloc, $infoplist);'


# Update versions in localised string files # Update versions in localised string files
Expand All @@ -117,10 +117,10 @@ php -r '$englishstringsloc = "/'$BUILD_DIR'/Sequel Pro.app/Contents/Resources/En
echo "Signing build..." echo "Signing build..."


# Code sign and verify the nightly # Code sign and verify the nightly
security unlock-keychain -p "$NIGHTLY_KEYCHAIN_PASSWORD" "$NIGHTLY_KEYCHAIN_LOC" #security unlock-keychain -p "$NIGHTLY_KEYCHAIN_PASSWORD" "$NIGHTLY_KEYCHAIN_LOC"
codesign -f --keychain "$NIGHTLY_KEYCHAIN_LOC" -s 'Developer ID Application: MJ Media' -r "../../Resources/sprequirement.bin" "Sequel Pro.app/Contents/Resources/SequelProTunnelAssistant" codesign -f --keychain "$NIGHTLY_KEYCHAIN_LOC" -s 'Developer ID Application: MJ Media' -r $GIT_DIR"/Resources/spframeworkrequirement.bin" "Sequel Pro.app/Contents/Resources/SequelProTunnelAssistant"
codesign -f --keychain "$NIGHTLY_KEYCHAIN_LOC" -s 'Developer ID Application: MJ Media' -r "../../Resources/sprequirement.bin" "Sequel Pro.app" codesign -f --keychain "$NIGHTLY_KEYCHAIN_LOC" -s 'Developer ID Application: MJ Media' -r $GIT_DIR"/Resources/sprequirement.bin" "Sequel Pro.app"
security lock-keychain "$NIGHTLY_KEYCHAIN_LOC" #security lock-keychain "$NIGHTLY_KEYCHAIN_LOC"
VERIFYERRORS=`codesign --verify "Sequel Pro.app" 2>&1` VERIFYERRORS=`codesign --verify "Sequel Pro.app" 2>&1`
VERIFYERRORS+=`codesign --verify "Sequel Pro.app/Contents/Resources/SequelProTunnelAssistant" 2>&1` VERIFYERRORS+=`codesign --verify "Sequel Pro.app/Contents/Resources/SequelProTunnelAssistant" 2>&1`
if [ "$VERIFYERRORS" != '' ] if [ "$VERIFYERRORS" != '' ]
Expand Down Expand Up @@ -156,7 +156,7 @@ echo "Disk image ready (hashed as $SIGNATURE)"
echo "Uploading disk image..." echo "Uploading disk image..."


# Upload the disk image # Upload the disk image
scp -q -P 32100 Sequel_Pro_r"$SHORT_HASH".dmg spnightlyuploader@sequelpro.com:nightlybuilds scp -P 32100 Sequel_Pro_r"$SHORT_HASH".dmg spnightlyuploader@sequelpro.com:nightlybuilds
RETURNVALUE=$? RETURNVALUE=$?
if [ $RETURNVALUE -eq 0 ] if [ $RETURNVALUE -eq 0 ]
then then
Expand Down

0 comments on commit a00f2a7

Please sign in to comment.