From 800a2f98b4665a3eea294559b852b4ab299ac463 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Mon, 7 Sep 2020 09:22:24 -0600 Subject: [PATCH 1/9] =?UTF-8?q?=F0=9F=8D=BA=20Update=20formula=20tag=20and?= =?UTF-8?q?=20revision?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Homebrew/mas-tap.rb | 4 ++-- Homebrew/mas.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Homebrew/mas-tap.rb b/Homebrew/mas-tap.rb index 98a3ff6fb..0a7484bf8 100644 --- a/Homebrew/mas-tap.rb +++ b/Homebrew/mas-tap.rb @@ -2,8 +2,8 @@ class Mas < Formula desc "Mac App Store command-line interface" homepage "https://github.com/mas-cli/mas" url "https://github.com/mas-cli/mas.git", - :tag => "v1.7.0", - :revision => "35575ff962687cfd9a12f859668cf61d5ea819c2" + :tag => "v1.7.1", + :revision => "b8dcb4ce4b1d78ada7556565dd5c73e9913758d8" head "https://github.com/mas-cli/mas.git" bottle do diff --git a/Homebrew/mas.rb b/Homebrew/mas.rb index 6a0909a35..4ad2861bd 100644 --- a/Homebrew/mas.rb +++ b/Homebrew/mas.rb @@ -2,8 +2,8 @@ class Mas < Formula desc "Mac App Store command-line interface" homepage "https://github.com/mas-cli/mas" url "https://github.com/mas-cli/mas.git", - :tag => "v1.7.0", - :revision => "35575ff962687cfd9a12f859668cf61d5ea819c2 + :tag => "v1.7.1", + :revision => "b8dcb4ce4b1d78ada7556565dd5c73e9913758d8" head "https://github.com/mas-cli/mas.git" bottle do From 51a4af5726a4107f4d01d778cb2e28344e32a047 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Mon, 7 Sep 2020 09:26:13 -0600 Subject: [PATCH 2/9] =?UTF-8?q?=F0=9F=93=9C=20Add=20build=5Fartifacts=20sc?= =?UTF-8?q?ript?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/build_artifacts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 script/build_artifacts diff --git a/script/build_artifacts b/script/build_artifacts new file mode 100755 index 000000000..479ddae10 --- /dev/null +++ b/script/build_artifacts @@ -0,0 +1,17 @@ +#!/bin/bash -e +# +# script/build_artifacts +# mas +# +# Runs all related scripts for generating all artifacts. +# + +VERSION=$(script/version) + +echo "Building mas $VERSION artifacts" + +script/clean +script/build +script/archive +script/install +script/package From 6576d410f89a17a355ba42f956ce6801f85e0c76 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Mon, 7 Sep 2020 10:09:28 -0600 Subject: [PATCH 3/9] =?UTF-8?q?=F0=9F=8D=BA=20Update=20formula=20with=20di?= =?UTF-8?q?fferences=20from=20homebrew-core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Homebrew/mas-tap.rb | 10 +++++++--- Homebrew/mas.rb | 12 ++++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Homebrew/mas-tap.rb b/Homebrew/mas-tap.rb index 0a7484bf8..949be540d 100644 --- a/Homebrew/mas-tap.rb +++ b/Homebrew/mas-tap.rb @@ -2,8 +2,9 @@ class Mas < Formula desc "Mac App Store command-line interface" homepage "https://github.com/mas-cli/mas" url "https://github.com/mas-cli/mas.git", - :tag => "v1.7.1", - :revision => "b8dcb4ce4b1d78ada7556565dd5c73e9913758d8" + tag: "v1.7.1", + revision: "b8dcb4ce4b1d78ada7556565dd5c73e9913758d8" + license "MIT" head "https://github.com/mas-cli/mas.git" bottle do @@ -17,16 +18,19 @@ class Mas < Formula end depends_on "carthage" => :build - depends_on :xcode => ["10.2", :build] + depends_on xcode: ["10.2", :build] def install # Working around build issues in dependencies # - Prevent warnings from causing build failures # - Prevent linker errors by telling all lib builds to use max size install names + # - Ensure dependencies build for the current CPU; otherwise Commandant will + # build for x86_64 when running arm64 xcconfig = buildpath/"Overrides.xcconfig" xcconfig.write <<~EOS GCC_TREAT_WARNINGS_AS_ERRORS = NO OTHER_LDFLAGS = -headerpad_max_install_names + VALID_ARCHS = #{Hardware::CPU.arch} EOS ENV["XCODE_XCCONFIG_FILE"] = xcconfig diff --git a/Homebrew/mas.rb b/Homebrew/mas.rb index 4ad2861bd..19a40d4ab 100644 --- a/Homebrew/mas.rb +++ b/Homebrew/mas.rb @@ -2,8 +2,9 @@ class Mas < Formula desc "Mac App Store command-line interface" homepage "https://github.com/mas-cli/mas" url "https://github.com/mas-cli/mas.git", - :tag => "v1.7.1", - :revision => "b8dcb4ce4b1d78ada7556565dd5c73e9913758d8" + tag: "v1.7.1", + revision: "b8dcb4ce4b1d78ada7556565dd5c73e9913758d8" + license "MIT" head "https://github.com/mas-cli/mas.git" bottle do @@ -13,20 +14,23 @@ class Mas < Formula end depends_on "carthage" => :build - depends_on :xcode => ["10.2", :build] + depends_on xcode: ["10.2", :build] def install # Working around build issues in dependencies # - Prevent warnings from causing build failures # - Prevent linker errors by telling all lib builds to use max size install names + # - Ensure dependencies build for the current CPU; otherwise Commandant will + # build for x86_64 when running arm64 xcconfig = buildpath/"Overrides.xcconfig" xcconfig.write <<~EOS GCC_TREAT_WARNINGS_AS_ERRORS = NO OTHER_LDFLAGS = -headerpad_max_install_names + VALID_ARCHS = #{Hardware::CPU.arch} EOS ENV["XCODE_XCCONFIG_FILE"] = xcconfig - # Only build necessary dependencies (Commandant, Result) + # Only build necessary dependencies system "carthage", "bootstrap", "--platform", "macOS", "Commandant" system "script/install", prefix From 8e09573963b74bbb470febcf59de198bbb4f0a51 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Mon, 7 Sep 2020 10:15:01 -0600 Subject: [PATCH 4/9] =?UTF-8?q?=F0=9F=90=9B=20Fix=20dynamic=20REVISION=20i?= =?UTF-8?q?n=20formula=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/brew_formula_update | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/brew_formula_update b/script/brew_formula_update index b0479cb27..ebbd18e04 100755 --- a/script/brew_formula_update +++ b/script/brew_formula_update @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e # # script/brew_formula_update # mas @@ -29,7 +29,7 @@ fi if test -n "$2"; then REVISION="$2" else - REVISION=$(git rev-parse HEAD) + REVISION=$(git rev-parse "$VERSION") fi echo "Checking to see if this update can be a simple bump." From 73991b0251cc16a75f16ebfb36b4b39d9d4c8673 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Mon, 7 Sep 2020 10:39:42 -0600 Subject: [PATCH 5/9] =?UTF-8?q?=F0=9F=90=9B=20Stability=20fixes=20for=20bo?= =?UTF-8?q?ttle=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/bottle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/script/bottle b/script/bottle index d60bbe70e..969fb825f 100755 --- a/script/bottle +++ b/script/bottle @@ -26,7 +26,7 @@ fi # Uninstall if still found on path if command -v mas > /dev/null; then - script/uninstall + script/uninstall || true # ignore failure fi # Purge the Carthage cache to avoid this error from Homebrew sandboxing: @@ -34,6 +34,11 @@ fi # fatal: Unable to create '/Users/ben/Library/Caches/org.carthage.CarthageKit/dependencies/Commandant/./index.lock': Operation not permitted rm -rf ~/Library/Caches/org.carthage.CarthageKit +# Uninstall carthage via Mint +if command -v mint > /dev/null; then + mint uninstall carthage +fi + # Build the formula brew install --build-bottle mas From 47b28678ebbfe0f3993c19c4c717a1d95f9bec4a Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Mon, 7 Sep 2020 10:40:32 -0600 Subject: [PATCH 6/9] =?UTF-8?q?=F0=9F=94=A7=20Revise=20editorconfig=20glob?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index e9582eeda..f46c76213 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,5 +12,5 @@ insert_final_newline = true [*.md] trim_trailing_whitespace = false -[{script/*,*.rb,*.yml}] +[{script/*,*.{rb,yml}}] indent_size = 2 From b39dc90cd316b3fa1e7b149ba976c3b5626b676b Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Mon, 7 Sep 2020 10:40:55 -0600 Subject: [PATCH 7/9] =?UTF-8?q?=F0=9F=93=9C=20Add=20brew=5Fupdate=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/brew_update | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100755 script/brew_update diff --git a/script/brew_update b/script/brew_update new file mode 100755 index 000000000..02f2d46e9 --- /dev/null +++ b/script/brew_update @@ -0,0 +1,14 @@ +#!/bin/bash -e +# +# script/build_artifacts +# mas +# +# Runs all related scripts for generating all artifacts. +# + +VERSION=$(script/version) + +echo "Updating mas $VERSION Homebrew formula" + +script/brew_formula_update +script/bottle From 8a247128704e5f43306129d6c54dda4f77f67940 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Mon, 7 Sep 2020 10:46:16 -0600 Subject: [PATCH 8/9] =?UTF-8?q?=F0=9F=8D=BC=20Update=20custom=20tap=20bott?= =?UTF-8?q?le=20hashes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Homebrew/mas-tap.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Homebrew/mas-tap.rb b/Homebrew/mas-tap.rb index 949be540d..642a2e333 100644 --- a/Homebrew/mas-tap.rb +++ b/Homebrew/mas-tap.rb @@ -10,11 +10,11 @@ class Mas < Formula bottle do root_url "https://dl.bintray.com/phatblat/mas-bottles" cellar :any - sha256 "adc9a2206f9fb5e7665cab7accea8ef682c382f35a8dabd8dd0cbd7bfbc82729" => :catalina - sha256 "adc9a2206f9fb5e7665cab7accea8ef682c382f35a8dabd8dd0cbd7bfbc82729" => :mojave - sha256 "adc9a2206f9fb5e7665cab7accea8ef682c382f35a8dabd8dd0cbd7bfbc82729" => :high_sierra - sha256 "adc9a2206f9fb5e7665cab7accea8ef682c382f35a8dabd8dd0cbd7bfbc82729" => :sierra - sha256 "adc9a2206f9fb5e7665cab7accea8ef682c382f35a8dabd8dd0cbd7bfbc82729" => :el_capitan + sha256 "de5acfedda59b73fbd36e4a966120aa1aa7e5eea4c07c19e75c0b21819b0900d" => :catalina + sha256 "de5acfedda59b73fbd36e4a966120aa1aa7e5eea4c07c19e75c0b21819b0900d" => :mojave + sha256 "de5acfedda59b73fbd36e4a966120aa1aa7e5eea4c07c19e75c0b21819b0900d" => :high_sierra + sha256 "de5acfedda59b73fbd36e4a966120aa1aa7e5eea4c07c19e75c0b21819b0900d" => :sierra + sha256 "de5acfedda59b73fbd36e4a966120aa1aa7e5eea4c07c19e75c0b21819b0900d" => :el_capitan end depends_on "carthage" => :build From 461322bd7e804f22e29ab5624fa2a240cdb67fad Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Mon, 7 Sep 2020 11:18:59 -0600 Subject: [PATCH 9/9] =?UTF-8?q?=F0=9F=8D=BC=20Update=20bottle=20hashes=20a?= =?UTF-8?q?fter=20BrewTestBot=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/Homebrew/homebrew-core/commit/6d01ce847bb0c179c9cc523e248225068ce927f1 --- Homebrew/mas.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Homebrew/mas.rb b/Homebrew/mas.rb index 19a40d4ab..758f95cc2 100644 --- a/Homebrew/mas.rb +++ b/Homebrew/mas.rb @@ -9,8 +9,8 @@ class Mas < Formula bottle do cellar :any - sha256 "b985d100947063ee94961f7f1290f232786634b869d20d56bd553197cf91188b" => :catalina - sha256 "c7005c34a3cf38d23f98e9cc238a0deae61f50ea5dfbcf51a34cc689a9db315e" => :mojave + sha256 "e6de2f98ebd21885a9827664fe1b7eea5516a7fd75d5b7383e3a9b088591a27f" => :catalina + sha256 "8b6dc4e261ebdc8e2f93afe87da3db4d482eb3d8a0358ab19a0485d434550e77" => :mojave end depends_on "carthage" => :build