🏗 Clean up CircleCI merge SHA logic#33215
Merged
rsimha merged 2 commits intoampproject:masterfrom Mar 12, 2021
rsimha:2021-03-11-CircleConfigUpdates
Merged
🏗 Clean up CircleCI merge SHA logic#33215rsimha merged 2 commits intoampproject:masterfrom rsimha:2021-03-11-CircleConfigUpdates
rsimha merged 2 commits intoampproject:masterfrom
rsimha:2021-03-11-CircleConfigUpdates
Conversation
ghost
approved these changes
Mar 11, 2021
Contributor
Author
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 |
Contributor
Author
|
@jridgewell Here's an updated / cleaned up config. Once you review / approve and we have a green build, I'm inclined to modify the |
jridgewell
approved these changes
Mar 12, 2021
Contributor
Author
|
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 |
westonruter
added a commit
to westonruter/amphtml
that referenced
this pull request
Mar 15, 2021
* '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) ...
muuki88
pushed a commit
to highfivve/amphtml
that referenced
this pull request
Mar 15, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Assorted cleanup after #33165:
fetch_merge_commit.shintocompute_merge_commit.shandget_pr_number.sh(🏗 Persist merge commit for reuse with later CI jobs #33165 (comment))amphtml-docker-small-executorto use a small docker instance with an updated spec (🏗 Use a small docker instance #33195)mergeShaso it can be used (and logged) by bundle-size (simplyexporting it is insufficient)