{"thread":{"id":"44932","subject":"[PATCH v1] travis-ci: fix Perforce install on macOS","startedAt":"2017-01-21T14:44:07Z","lastAt":"2017-01-23T18:35:41Z","messageCount":3,"participants":["larsxschneider@gmail.com","Junio C Hamano","Lars Schneider"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"309897","messageId":"20170121144245.31702-1-larsxschneider@gmail.com","threadId":"44932","inReplyTo":null,"subject":"[PATCH v1] travis-ci: fix Perforce install on macOS","fromName":"","fromEmail":"larsxschneider@gmail.com","sentAt":"2017-01-21T14:42:45Z","receivedAt":"2017-01-21T14:44:07Z","isPatch":true,"sender":{"key":"larsxschneider@gmail.com","avatar":"https://avatars.githubusercontent.com/u/477434?v=4"},"body":"From: Lars Schneider <larsxschneider@gmail.com>\n\nThe `perforce` and `perforce-server` package were moved from brew [1][2]\nto cask [3]. Teach TravisCI the new location.\n\nPerforce updates their binaries without version bumps. That made the\nbrew install (legitimately!) fail due to checksum mismatches. The\nworkaround is not necessary anymore as Cask [4] allows to disable the\nchecksum test for individual formulas.\n\n[1] https://github.com/Homebrew/homebrew-binary/commit/1394e42de04d07445f82f9512627e864ff4ca4c6\n[2] https://github.com/Homebrew/homebrew-binary/commit/f8da22d6b8dbcfcfdb2dfa9ac1a5e5d8e05aac2b\n[3] https://github.com/caskroom/homebrew-cask/pull/29180\n[4] https://caskroom.github.io/\n\nSigned-off-by: Lars Schneider <larsxschneider@gmail.com>\n---\n\nHi Junio,\n\nthis patch should fix the TravisCI builds:\nhttps://travis-ci.org/git/git/builds\n\nCould you fast track the patch to `maint` if it works without trouble on\n`next` (as it should!)?\n\nThanks,\nLars\n\nNotes:\n    Base Commit: 787f75f056 (master)\n    Diff on Web: https://github.com/larsxschneider/git/commit/ec7106339d\n    Checkout:    git fetch https://github.com/larsxschneider/git travisci/brew-perforce-fix-v1 && git checkout ec7106339d\n\n .travis.yml | 11 ++---------\n 1 file changed, 2 insertions(+), 9 deletions(-)\n\ndiff --git a/.travis.yml b/.travis.yml\nindex 3843967a69..c6ba8c8ec5 100644\n--- a/.travis.yml\n+++ b/.travis.yml\n@@ -75,20 +75,13 @@ before_install:\n       popd\n       ;;\n     osx)\n-      brew_force_set_latest_binary_hash () {\n-        FORMULA=$1\n-        SHA=$(brew fetch --force $FORMULA 2>&1 | grep ^SHA256: | cut -d ' ' -f 2)\n-        sed -E -i.bak \"s/sha256 \\\"[0-9a-f]{64}\\\"/sha256 \\\"$SHA\\\"/g\" \\\n-          \"$(brew --repository homebrew/homebrew-binary)/$FORMULA.rb\"\n-      }\n       brew update --quiet\n       brew tap homebrew/binary --quiet\n-      brew_force_set_latest_binary_hash perforce\n-      brew_force_set_latest_binary_hash perforce-server\n       # Uncomment this if you want to run perf tests:\n       # brew install gnu-time\n-      brew install git-lfs perforce-server perforce gettext\n+      brew install git-lfs gettext\n       brew link --force gettext\n+      brew install Caskroom/cask/perforce\n       ;;\n     esac;\n     echo \"$(tput setaf 6)Perforce Server Version$(tput sgr0)\";\n--\n2.11.0\n\n"},{"id":"309991","messageId":"xmqq8tq1tz49.fsf@gitster.mtv.corp.google.com","threadId":"44932","inReplyTo":"20170121144245.31702-1-larsxschneider@gmail.com","subject":"Re: [PATCH v1] travis-ci: fix Perforce install on macOS","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-01-23T18:22:46Z","receivedAt":"2017-01-23T18:22:59Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"larsxschneider@gmail.com writes:\n\n> Could you fast track the patch to `maint` if it works without trouble on\n> `next` (as it should!)?\n>\n> Notes:\n>     Base Commit: 787f75f056 (master)\n\nI do not think there is any difference between 'maint' and 'master'\nfor this file right now, but I still would have appreciated if this\nline also said 'maint', not 'master', if you want it to go to\n'maint' eventually ;-) As https://travis-ci.org/git/git/builds seems\nto be doing 'pu', too, hopefully we'll catch any issues there first.\n\nThanks.\n\n>     Diff on Web: https://github.com/larsxschneider/git/commit/ec7106339d\n>     Checkout:    git fetch https://github.com/larsxschneider/git travisci/brew-perforce-fix-v1 && git checkout ec7106339d\n>\n>  .travis.yml | 11 ++---------\n>  1 file changed, 2 insertions(+), 9 deletions(-)\n>\n> diff --git a/.travis.yml b/.travis.yml\n> index 3843967a69..c6ba8c8ec5 100644\n> --- a/.travis.yml\n> +++ b/.travis.yml\n> @@ -75,20 +75,13 @@ before_install:\n>        popd\n>        ;;\n>      osx)\n> -      brew_force_set_latest_binary_hash () {\n> -        FORMULA=$1\n> -        SHA=$(brew fetch --force $FORMULA 2>&1 | grep ^SHA256: | cut -d ' ' -f 2)\n> -        sed -E -i.bak \"s/sha256 \\\"[0-9a-f]{64}\\\"/sha256 \\\"$SHA\\\"/g\" \\\n> -          \"$(brew --repository homebrew/homebrew-binary)/$FORMULA.rb\"\n> -      }\n>        brew update --quiet\n>        brew tap homebrew/binary --quiet\n> -      brew_force_set_latest_binary_hash perforce\n> -      brew_force_set_latest_binary_hash perforce-server\n>        # Uncomment this if you want to run perf tests:\n>        # brew install gnu-time\n> -      brew install git-lfs perforce-server perforce gettext\n> +      brew install git-lfs gettext\n>        brew link --force gettext\n> +      brew install Caskroom/cask/perforce\n>        ;;\n>      esac;\n>      echo \"$(tput setaf 6)Perforce Server Version$(tput sgr0)\";\n> --\n> 2.11.0\n"},{"id":"309993","messageId":"56F3C5E4-0E50-453E-BF47-AFF38BC7906D@gmail.com","threadId":"44932","inReplyTo":"xmqq8tq1tz49.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH v1] travis-ci: fix Perforce install on macOS","fromName":"Lars Schneider","fromEmail":"larsxschneider@gmail.com","sentAt":"2017-01-23T18:35:26Z","receivedAt":"2017-01-23T18:35:41Z","isPatch":true,"sender":{"key":"larsxschneider@gmail.com","avatar":"https://avatars.githubusercontent.com/u/477434?v=4"},"body":"\n> On 23 Jan 2017, at 19:22, Junio C Hamano <gitster@pobox.com> wrote:\n> \n> larsxschneider@gmail.com writes:\n> \n>> Could you fast track the patch to `maint` if it works without trouble on\n>> `next` (as it should!)?\n>> \n>> Notes:\n>>    Base Commit: 787f75f056 (master)\n> \n> I do not think there is any difference between 'maint' and 'master'\n> for this file right now, but I still would have appreciated if this\n> line also said 'maint', not 'master', if you want it to go to\n> 'maint' eventually ;-) As https://travis-ci.org/git/git/builds seems\n> to be doing 'pu', too, hopefully we'll catch any issues there first.\n\nYou're right! My own automation betrayed me :-)\n\nI made a tiny change, though. Can you queue v2?\nhttp://public-inbox.org/git/20170122225550.28422-1-larsxschneider@gmail.com/\n\nThanks,\nLars\n\n"}]}