-
Notifications
You must be signed in to change notification settings - Fork 3.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
🏗 Clean up CircleCI merge SHA logic #33215
🏗 Clean up CircleCI merge SHA logic #33215
Conversation
Found a way, but it's probably too much trouble to do this dynamically in # Download PR version of a file
curl -H 'Accept: application/vnd.github.v3.raw' \
https://api.github.com/repos/ampproject/amphtml/contents/.circleci/fetch_merge_commit.sh?ref=refs/pull/33215/merge
# Download master version of a file
curl -H 'Accept: application/vnd.github.v3.raw' \
https://api.github.com/repos/ampproject/amphtml/contents/.circleci/fetch_merge_commit.sh?ref=master |
@jridgewell Here's an updated / cleaned up config. Once you review / approve and we have a green build, I'm inclined to modify the |
At long last, we have everything working end-to-end. For posterity, here's verification:
Based on this, I'm going to push a new commit that updates the URLs from |
* 'master' of github.com:ampproject/amphtml: (536 commits) ✨ Send extension versions from AMPHTML ads to FIE (ampproject#33190) Update amp-autocomplete test output file (ampproject#33216) ✨ Changing Inline Page Attachment Button UI (ampproject#33142) ✨Launch no-signing (ampproject#33229) ♻️ Add logic for story ad page manager. (ampproject#33201) Migrate Bento components to V1 (ampproject#32974) 📦 Update dependency mocha to v8.3.2 (ampproject#33234) 📦 Update build system devDependencies (ampproject#33178) 🧪 [amp-consent] Turn on TCF PostMessage Proxy API Experiment (ampproject#33196) Fix amp-video amp_video_quality parameter name. (ampproject#33227) 🏗 Guard access to `BASH_ENV` during CircleCI push builds (ampproject#33231) 🏗 Clean up CircleCI merge SHA logic (ampproject#33215) 📦 Update dependency karma to v6.1.2 (ampproject#33151) 🏗 Ensure up-to-date and clean `package-lock.json` before running any CI job (ampproject#33223) Ensure that pre-stubbing always happens before the first element is upgraded (ampproject#33212) 🏗 Restore `package-lock.json` to `lockfileVersion = 1` (ampproject#33222) Fixed text align of buttons (ampproject#33217) [amp-story] ♿ Add label for next story and add i18n for pagination buttons (ampproject#33205) [amp-story-player] 📖 Rename skip-next control to skip-to-next (ampproject#33164) 🚀 Report cls-fcp and cls-vis to compare with cls (ampproject#33207) ...
Assorted cleanup after #33165:
fetch_merge_commit.sh
intocompute_merge_commit.sh
andget_pr_number.sh
(🏗 Persist merge commit for reuse with later CI jobs #33165 (comment))amphtml-docker-small-executor
to use a small docker instance with an updated spec (🏗 Use a small docker instance #33195)mergeSha
so it can be used (and logged) by bundle-size (simplyexport
ing it is insufficient)