Fix brew formula update #14403

paulrouget · 2016-11-29T03:46:06Z

Fix servo/saltfs#535

I decided to merge update_brew within upload_nightly.

I hope this will fix the brew formula upadte.

This change is

highfive · 2016-11-29T03:46:10Z

Heads up! This PR modifies the following files:

@aneeshusa: etc/ci/upload_nightly.sh, etc/ci/update_brew.sh, etc/ci/buildbot_steps.yml

aneeshusa

Sorry about the delay, the approach looks reasonable. This will require a PR to saltfs to pass the homebrew token to this script instead of the update_brew.sh script.

aneeshusa · 2016-12-07T01:08:39Z

etc/ci/upload_nightly.sh

+    local -r package="${2}"
+    local -r extension="${3}"
+
+    local -r nightly_timestamp="$(date -u +"%Y-%m-%dT%H-%M-%SZ")"


The use of local will always cause this line to exit with a zero return code, masking any errors from the subshell invocation. Hence, it's best to first declare the variable(s) as local, then do the variable assignment (and then optionally mark those variables as readonly afterwards).

Also, I'd move the nightly_timestamp generation/assignment into main, and have main responsible for calling upload and update_brew as necessary.

aneeshusa · 2016-12-07T01:08:39Z

etc/ci/upload_nightly.sh

+    s3cmd cp "${package_upload_path}" \
+      "${nightly_upload_dir}/servo-latest.${extension}"
+
+    if [[ "${platform}" == "macbrew" ]]


style nit: put the then on the same line

aneeshusa · 2016-12-07T01:08:39Z

etc/ci/upload_nightly.sh

+  package_url="https://download.servo.org/nightly/macbrew/${nightly_filename}"
+  sha=$(shasum -a 256 ${package} | sed -e 's/ .*//')
+  version=$(echo "${nightly_timestamp}" | \
+    sed -n 's/\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/\1.\2.\3/p')


Can you add a comment about what this regex is doing?

aneeshusa · 2016-12-07T01:08:39Z

etc/ci/upload_nightly.sh

+  local package_url sha version script_dir tmp_dir
+
+  package_url="https://download.servo.org/nightly/macbrew/${nightly_filename}"
+  sha=$(shasum -a 256 ${package} | sed -e 's/ .*//')


Make sure to double-quote variables and command substitutions per the style guide.

aneeshusa · 2016-12-07T01:08:39Z

etc/ci/upload_nightly.sh

+  git commit -m "Version bump: ${version}"
+
+  git push -qf \
+      "https://${TOKEN}@github.com/servo/homebrew-servo.git" master \


Please rename the TOKEN to be less generic, something like HOMEBREW_PUSH_TOKEN.


        Auto merge of #541 - servo:fixBrew, r=aneeshusa

update_brew doesn't exist anymore follow up servo/servo#14403  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/541)

aneeshusa

Just a few last nits.

aneeshusa · 2016-12-29T05:43:45Z

etc/ci/upload_nightly.sh

+
+  nightly_filename="${2}-$(basename "${1}")"
+  package_url="https://download.servo.org/nightly/macbrew/${nightly_filename}"
+  sha="$(shasum -a 256 ${1} | sed -e 's/ .*//')"


nit: Double-quote "${1}"

Not sure how to properly do that. \" doesn't work for some reason.

$() creates a new quoting context, so you should be able to just do "$(shasum -a 256 "${1}" | sed ...)"

oh right. It works.

aneeshusa · 2016-12-29T05:43:45Z

etc/ci/upload_nightly.sh

+    sed -n 's/\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).*/\1.\2.\3/p')"
+
+  script_dir="${PWD}/$(dirname "${0}")"
+  tmp_dir="$(mktemp -d -t homebrew-servo)"


Add some uppercase Xs to the end of the template, i.e. homebrew-servo.XXXXXXXXX, so not the temporary directory used is randomized.

iirc, that's only true on Linux. mktemp on mack adds a postfix automatically.

Oh, I didn't know that, that's a nice feature. Still might be nice to have in case this gets blindly copy-pasted out of context later, but up to you if you want to change it.

aneeshusa · 2016-12-29T05:43:45Z

etc/ci/upload_nightly.sh

+      "https://${GITHUB_HOMEBREW_TOKEN}@github.com/servo/homebrew-servo.git" \
+      master >/dev/null 2>&1
+
+  rm -rf ${tmp_dir}


Please double-quote "${tmp_dir}".
Also, we're still inside the directory at this point (it's the pwd), so I'm not sure how we're able to delete it...we should cd back to somewhere else (e.g. the "${script_dir}") first.

An alternative to using cd entirely is using the -C argument for the git invocations, e.g. git -C "${tmp_dir}" add ... and editing the path in the sed invocation to "${tmp_dir}/Formula/servo-bin.rb". This avoids cd completely, which I find nicer to reason about.


        Fix brew formula update

paulrouget · 2017-01-05T08:32:50Z

Comments addressed.

aneeshusa · 2017-01-05T08:42:02Z

LGTM, thanks for fixing this! @bors-servo r+

bors-servo · 2017-01-05T08:42:03Z

📌 Commit e1654d9 has been approved by aneeshusa

bors-servo · 2017-01-05T08:42:07Z

⌛ Testing commit e1654d9 with merge 7519fc8...


        Auto merge of #14403 - paulrouget:fixBrew, r=aneeshusa

Fix brew formula update Fix servo/saltfs#535 I decided to merge update_brew within upload_nightly. I hope this will fix the brew formula upadte.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14403)

bors-servo · 2017-01-05T09:44:36Z

💔 Test failed - linux-rel-css

paulrouget · 2017-01-06T03:51:34Z

@bors-servo: retry

#13919

bors-servo · 2017-01-06T03:59:19Z

⌛ Testing commit e1654d9 with merge 207f9a5...


        Auto merge of #14403 - paulrouget:fixBrew, r=aneeshusa

Fix brew formula update Fix servo/saltfs#535 I decided to merge update_brew within upload_nightly. I hope this will fix the brew formula upadte.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14403)

bors-servo · 2017-01-06T05:08:12Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-gnu-dev, windows-msvc-dev

highfive assigned glennw Nov 29, 2016

highfive added the S-awaiting-review label Nov 29, 2016

paulrouget assigned aneeshusa and unassigned glennw Nov 29, 2016

paulrouget mentioned this pull request Nov 29, 2016

update_brew doesn't exist anymore servo/saltfs#541

Merged

aneeshusa reviewed Dec 7, 2016

View changes

aneeshusa added S-needs-code-changes and removed S-awaiting-review labels Dec 7, 2016

paulrouget force-pushed the paulrouget:fixBrew branch from 86dd153 to 1b6c193 Dec 13, 2016

highfive added S-awaiting-review and removed S-needs-code-changes labels Dec 13, 2016

aneeshusa requested changes Dec 29, 2016

View changes

aneeshusa added S-needs-code-changes and removed S-awaiting-review labels Dec 29, 2016

Fix brew formula update

Loading status checks…

e1654d9

paulrouget force-pushed the paulrouget:fixBrew branch from 1b6c193 to e1654d9 Jan 5, 2017

highfive added S-awaiting-review and removed S-needs-code-changes labels Jan 5, 2017

highfive added S-awaiting-merge and removed S-awaiting-review labels Jan 5, 2017

aneeshusa approved these changes Jan 5, 2017

View changes

highfive removed the S-awaiting-merge label Jan 5, 2017

highfive added the S-tests-failed label Jan 5, 2017

highfive added S-awaiting-merge and removed S-tests-failed labels Jan 6, 2017

bors-servo merged commit e1654d9 into servo:master Jan 6, 2017
3 checks passed

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Jan 6, 2017

servo / servo

Fix brew formula update #14403

Fix brew formula update #14403

paulrouget commented Nov 29, 2016 •

edited by larsbergstrom

highfive commented Nov 29, 2016

aneeshusa left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

aneeshusa left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

paulrouget commented Jan 5, 2017

aneeshusa commented Jan 5, 2017

bors-servo commented Jan 5, 2017

bors-servo commented Jan 5, 2017

bors-servo commented Jan 5, 2017

paulrouget commented Jan 6, 2017 •

edited by KiChjang

bors-servo commented Jan 6, 2017

bors-servo commented Jan 6, 2017

servo / servo

Join GitHub today

Fix brew formula update #14403

Fix brew formula update #14403

Conversation

paulrouget commented Nov 29, 2016 • edited by larsbergstrom

highfive commented Nov 29, 2016

aneeshusa left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

aneeshusa left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

paulrouget Jan 5, 2017 • edited

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

paulrouget commented Jan 5, 2017

aneeshusa commented Jan 5, 2017

bors-servo commented Jan 5, 2017

bors-servo commented Jan 5, 2017

bors-servo commented Jan 5, 2017

paulrouget commented Jan 6, 2017 • edited by KiChjang

bors-servo commented Jan 6, 2017

bors-servo commented Jan 6, 2017

paulrouget commented Nov 29, 2016 •

edited by larsbergstrom

paulrouget Jan 5, 2017 •

edited

paulrouget commented Jan 6, 2017 •

edited by KiChjang