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

ci(restore-node): avoid clobbering #endo-branch: setup #8155

Merged
merged 1 commit into from
Aug 9, 2023

Conversation

michaelfig
Copy link
Member

@michaelfig michaelfig commented Aug 7, 2023

#not-endo-branch: markm-options-harmony
closes: #8148

Description

As described in #8148 (comment) , fix two problems with the .github/actions/restore-node composite CI action that interacted badly with the #endo-branch: PR setting.

Background: the #endo-branch: XXX comment in a PR description will cause restore-node to override package references in yarn.lock with packages built from the XXX branch of https://github.com/endojs/endo

The compounding problems:

  1. restore-node patched package.json and then, after running yarn install, restored it and yarn.lock. This meant any subsequent installs would overwrite packages installed by the override with the repository default versions.
  2. restore-node also used clean: 'false' instead of clean: false. The string 'false' is truthy, so that caused test-cosmic-swingset's use of bin/agd to detect changes in installation timestamps and thereby rerun yarn install, provoking the above problem.

Security Considerations

n/a

Scaling Considerations

Slightly speeds up test-cosmic-swingset.

Documentation Considerations

n/a

Testing Considerations

Tested by examining the output of #endo-branch: markm-options-harmony's run of test-cosmic-swingset.

Upgrade Considerations

n/a

@michaelfig michaelfig self-assigned this Aug 7, 2023
@michaelfig michaelfig added the tooling repo-wide infrastructure label Aug 7, 2023
@michaelfig michaelfig force-pushed the mfig-endo-branch-cache branch 3 times, most recently from 9cc712d to 999d7d7 Compare August 7, 2023 05:56
@michaelfig michaelfig marked this pull request as draft August 7, 2023 22:06
@michaelfig michaelfig requested review from turadg and mhofman August 8, 2023 01:28
@michaelfig michaelfig marked this pull request as ready for review August 8, 2023 01:28
@michaelfig michaelfig force-pushed the mfig-endo-branch-cache branch 4 times, most recently from 741e4f1 to 52a2ab6 Compare August 9, 2023 02:45
@michaelfig michaelfig force-pushed the mfig-endo-branch-cache branch from 52a2ab6 to 84101f1 Compare August 9, 2023 02:50
@michaelfig michaelfig enabled auto-merge August 9, 2023 02:52
@michaelfig michaelfig added this pull request to the merge queue Aug 9, 2023
Merged via the queue into master with commit d97cea7 Aug 9, 2023
@michaelfig michaelfig deleted the mfig-endo-branch-cache branch August 9, 2023 03:44
mhofman pushed a commit that referenced this pull request Aug 15, 2023
ci(restore-node): avoid clobbering `#endo-branch:` setup
mhofman pushed a commit that referenced this pull request Aug 15, 2023
ci(restore-node): avoid clobbering `#endo-branch:` setup
mhofman pushed a commit that referenced this pull request Jan 12, 2024
ci(restore-node): avoid clobbering `#endo-branch:` setup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tooling repo-wide infrastructure
Projects
None yet
Development

Successfully merging this pull request may close these issues.

#endo-branch: mechanism might be failing
2 participants