From 625a7053f172294a776d66fa3d10e79d86cf71eb Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sat, 12 Jan 2019 13:05:09 -0700 Subject: [PATCH 1/9] =?UTF-8?q?=F0=9F=91=B7=F0=9F=8F=BB=E2=80=8D=E2=99=80?= =?UTF-8?q?=EF=B8=8F=20Skip=20SwiftLint=20run=20script=20on=20CI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mas-cli.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj index 723dafe..d469a8d 100644 --- a/mas-cli.xcodeproj/project.pbxproj +++ b/mas-cli.xcodeproj/project.pbxproj @@ -889,7 +889,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if which -s swiftlint; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n"; + shellScript = "if test -n \"$JENKINS_URL\"\nthen\n echo \"Skipping SwiftLint run script on CI, will run in Lint stage.\"\n return\nfi\n\nif which -s swiftlint; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n"; }; /* End PBXShellScriptBuildPhase section */ From 2a161768744035effe269bf4e16f6268037712bc Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sat, 12 Jan 2019 13:23:09 -0700 Subject: [PATCH 2/9] =?UTF-8?q?=E2=9E=95=20Add=20swiftlint=20to=20brew=20b?= =?UTF-8?q?undle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Brewfile | 3 ++- script/bootstrap | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Brewfile b/Brewfile index c6a860c..831f54c 100644 --- a/Brewfile +++ b/Brewfile @@ -1 +1,2 @@ -brew "carthage" \ No newline at end of file +brew "carthage" +brew "swiftlint" diff --git a/script/bootstrap b/script/bootstrap index 009ff39..037a216 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -3,7 +3,7 @@ main() { echo "==> 👢 Bootstrapping" bundle install - brew bundle + brew bundle install --verbose carthage bootstrap --platform macOS --cache-builds script/sort From 6e60c86e2343d9bc4dd59890aebce6564262a24d Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sat, 12 Jan 2019 13:27:00 -0700 Subject: [PATCH 3/9] =?UTF-8?q?=F0=9F=94=87=20Reduce=20swiftlint=20run=20s?= =?UTF-8?q?cript=20output?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mas-cli.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj index d469a8d..7d30636 100644 --- a/mas-cli.xcodeproj/project.pbxproj +++ b/mas-cli.xcodeproj/project.pbxproj @@ -889,7 +889,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if test -n \"$JENKINS_URL\"\nthen\n echo \"Skipping SwiftLint run script on CI, will run in Lint stage.\"\n return\nfi\n\nif which -s swiftlint; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n"; + shellScript = "if test -n \"$JENKINS_URL\"\nthen\n echo \"Skipping SwiftLint run script on CI, will run in Lint stage.\"\n return\nfi\n\nif which -s swiftlint; then\n swiftlint lint --quiet\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n"; }; /* End PBXShellScriptBuildPhase section */ From 803e321fe41e49ec8c7ac2ba7cbf42e052382ad0 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sat, 12 Jan 2019 13:30:08 -0700 Subject: [PATCH 4/9] =?UTF-8?q?=F0=9F=93=9C=20Add=20lint=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/lint | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 script/lint diff --git a/script/lint b/script/lint new file mode 100755 index 0000000..bca2095 --- /dev/null +++ b/script/lint @@ -0,0 +1,5 @@ +#!/bin/bash -e + +echo "==> 🚨 Linting mas" + +swiftlint lint --strict From 9a80763c7b1a21e641170e8e3d188c33c05f7766 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sat, 12 Jan 2019 13:30:59 -0700 Subject: [PATCH 5/9] =?UTF-8?q?=F0=9F=91=B7=F0=9F=8F=BB=E2=80=8D=E2=99=82?= =?UTF-8?q?=EF=B8=8F=20Run=20lint=20script=20in=20pipeline?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c108038..bd92a3d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,7 +49,7 @@ pipeline { stage('Lint') { steps { ansiColor('xterm') { - echo 'Not implemented' + sh 'script/lint' } } } From d5b6e063e1e4bfe418e8ea261c1afaa628fc2a9d Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sat, 12 Jan 2019 18:33:44 -0700 Subject: [PATCH 6/9] =?UTF-8?q?=F0=9F=93=9C=20Extract=20danger=20command?= =?UTF-8?q?=20into=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 3 +-- script/danger | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 script/danger diff --git a/Jenkinsfile b/Jenkinsfile index bd92a3d..a8becc6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,8 +56,7 @@ pipeline { stage('Danger') { steps { ansiColor('xterm') { - // sh 'bundle install --verbose' - sh 'bundle exec danger --verbose' + sh 'script/danger' } } } diff --git a/script/danger b/script/danger new file mode 100644 index 0000000..b5f99b4 --- /dev/null +++ b/script/danger @@ -0,0 +1,9 @@ +#!/bin/bash -e +# +# script/danger +# mas-cli +# + +echo "==> ⚠️ Running danger" + +bundle exec danger --verbose From 8917a3017560678d07f0eb36dea37bb49ec75d28 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sat, 12 Jan 2019 18:47:11 -0700 Subject: [PATCH 7/9] =?UTF-8?q?=F0=9F=94=AB=20Make=20danger=20executable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/danger | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 script/danger diff --git a/script/danger b/script/danger old mode 100644 new mode 100755 From 2d6e4b059fc991c098ebdefe36a71a642fd870ba Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sat, 12 Jan 2019 18:50:34 -0700 Subject: [PATCH 8/9] =?UTF-8?q?=F0=9F=94=96=20Version=201.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 7 ++++++- MasKit/SupportingFiles/Info.plist | 4 ++-- MasKitTests/SupportingFiles/Info.plist | 4 ++-- mas-cli.xcodeproj/project.pbxproj | 16 ++++++++-------- mas/mas-Info.plist | 2 +- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75a4a4b..ec2b96f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] + + +## [v1.6.0] 🔗 Links - 2019-01-12 + - 👐🏻 Open AppStore.app with just `mas open` #200 - ♻️🌐 Network refactor #198 - 👷🏻‍♀️ Jenkins Pipeline #197 @@ -140,7 +144,8 @@ Use the `mas.pkg` package to install manually. ## [v1.0.0] - 2015-09-20 - Initial Release -[Unreleased]: https://github.com/mas-cli/mas/compare/v1.5.0...HEAD +[Unreleased]: https://github.com/mas-cli/mas/compare/v1.6.0...HEAD +[v1.6.0]: https://github.com/mas-cli/mas/compare/v1.5.0...v1.6.0 [v1.5.0]: https://github.com/mas-cli/mas/compare/v1.4.4...v1.5.0 [v1.4.4]: https://github.com/mas-cli/mas/compare/v1.4.3...v1.4.4 [v1.4.3]: https://github.com/mas-cli/mas/compare/v1.4.2...v1.4.3 diff --git a/MasKit/SupportingFiles/Info.plist b/MasKit/SupportingFiles/Info.plist index ed5ad19..7665ad5 100644 --- a/MasKit/SupportingFiles/Info.plist +++ b/MasKit/SupportingFiles/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.5.1 + 1.6.0 CFBundleVersion - 10501000 + 10600000 NSHumanReadableCopyright Copyright © 2018 Andrew Naylor. All rights reserved. diff --git a/MasKitTests/SupportingFiles/Info.plist b/MasKitTests/SupportingFiles/Info.plist index c2306f9..554ff47 100644 --- a/MasKitTests/SupportingFiles/Info.plist +++ b/MasKitTests/SupportingFiles/Info.plist @@ -15,8 +15,8 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.5.1 + 1.6.0 CFBundleVersion - 10501000 + 10600000 diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj index 7d30636..dd59f8f 100644 --- a/mas-cli.xcodeproj/project.pbxproj +++ b/mas-cli.xcodeproj/project.pbxproj @@ -1037,7 +1037,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CREATE_INFOPLIST_SECTION_IN_BINARY = YES; - CURRENT_PROJECT_VERSION = 10501000; + CURRENT_PROJECT_VERSION = 10600000; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1102,7 +1102,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CREATE_INFOPLIST_SECTION_IN_BINARY = YES; - CURRENT_PROJECT_VERSION = 10501000; + CURRENT_PROJECT_VERSION = 10600000; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -1189,10 +1189,10 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 10501000; + CURRENT_PROJECT_VERSION = 10600000; DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 5.0; - DYLIB_CURRENT_VERSION = 5.1; + DYLIB_COMPATIBILITY_VERSION = 6.0; + DYLIB_CURRENT_VERSION = 6.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1227,10 +1227,10 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 10501000; + CURRENT_PROJECT_VERSION = 10600000; DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 5.0; - DYLIB_CURRENT_VERSION = 5.1; + DYLIB_COMPATIBILITY_VERSION = 6.0; + DYLIB_CURRENT_VERSION = 6.0; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/mas/mas-Info.plist b/mas/mas-Info.plist index 9db09c0..c823327 100644 --- a/mas/mas-Info.plist +++ b/mas/mas-Info.plist @@ -11,6 +11,6 @@ CFBundleName mas-cli CFBundleShortVersionString - 1.5.1 + 1.6.0 From 52b25b716f58a583470640c2ff2ae589f75d7df8 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sat, 12 Jan 2019 18:51:45 -0700 Subject: [PATCH 9/9] =?UTF-8?q?=F0=9F=98=83=20Add=20emoji=20to=20pipeline?= =?UTF-8?q?=20stages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a8becc6..63978ef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { } stages { - stage('Assemble') { + stage('🏗️ Assemble') { steps { ansiColor('xterm') { sh 'script/bootstrap' @@ -39,21 +39,21 @@ pipeline { } } } - stage('Test') { + stage('✅ Test') { steps { ansiColor('xterm') { sh 'script/test' } } } - stage('Lint') { + stage('🚨 Lint') { steps { ansiColor('xterm') { sh 'script/lint' } } } - stage('Danger') { + stage('⚠️ Danger') { steps { ansiColor('xterm') { sh 'script/danger'