Skip to content
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

Merged
merged 2 commits into from
Mar 12, 2021
Merged

🏗 Clean up CircleCI merge SHA logic #33215

merged 2 commits into from
Mar 12, 2021

Conversation

rsimha
Copy link
Contributor

@rsimha rsimha commented Mar 11, 2021

Assorted cleanup after #33165:

@rsimha rsimha requested a review from jridgewell March 12, 2021 01:13
@rsimha rsimha marked this pull request as ready for review March 12, 2021 01:14
@rsimha
Copy link
Contributor Author

rsimha commented Mar 12, 2021

looking for a way to avoid the two-step commit of the file location to curl.

Found a way, but it's probably too much trouble to do this dynamically in yaml, not to mention the chicken-and-egg problem of determining the ref. Anyhow, here it is (see URL params):

# 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

@rsimha
Copy link
Contributor Author

rsimha commented Mar 12, 2021

@jridgewell Here's an updated / cleaned up config. Once you review / approve and we have a green build, I'm inclined to modify the curl locations to master and force-merge to avoid the two-step checkin. WDYT?

@rsimha rsimha changed the title 🏗 Clean up CircleCI config 🏗 Clean up CircleCI merge SHA logic Mar 12, 2021
@rsimha
Copy link
Contributor Author

rsimha commented Mar 12, 2021

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 rsimha/amphtml/2021-03-11-CircleConfigUpdates to ampproject/amphtml/master (736dd0a) and merge this PR.

@rsimha rsimha merged commit 28575f9 into ampproject:master Mar 12, 2021
@rsimha rsimha deleted the 2021-03-11-CircleConfigUpdates branch March 12, 2021 03:02
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants