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

Fix materialized deps #460

Merged
merged 1 commit into from
Aug 26, 2021
Merged

Conversation

RyanBrushett
Copy link
Contributor

@RyanBrushett RyanBrushett commented Aug 25, 2021

Motivation

The bundler materialized deps changed a bit more than we initially thought and the materialized dependencies still included the missing specs as it was.

This fixes that properly.

Implementation

  • Filter the list of materialized deps so that missing_specs are rejected.
  • Fix a skipped test that would have caught this issue. Thanks @paracycle for pointing that out! Fixes Shopify/sorbet-issues#330
  • Change CI so we're passing the BUNDLER_VERSION env var. rather than the _version_ syntax.
  • Exclude the support repo's Gemfile.lock again. Committing it means the tests will all run on the same bundler version, regardless of what is set by the env.
  • Lock the versions of the things in the Gemfile that are sensitive to change. Given it's a test repo, no more surprises is good.

Tests

See automated tests.

@RyanBrushett
Copy link
Contributor Author

If it makes backporting this to the 0-4-stable branch easier, I can split this up a little bit.

.github/workflows/ci.yml Outdated Show resolved Hide resolved
spec/support/repo/Gemfile.lock Outdated Show resolved Hide resolved
@paracycle
Copy link
Member

If it makes backporting this to the 0-4-stable branch easier, I can split this up a little bit.

The current state is fine, shouldn't be a problem.

@RyanBrushett RyanBrushett force-pushed the ryanb-fix-materialized-dependencies branch 2 times, most recently from 189c47b to 05e6d29 Compare August 25, 2021 23:31
Co-authored-by: Ufuk Kayserilioglu <ufuk.kayserilioglu@shopify.com>
@RyanBrushett RyanBrushett force-pushed the ryanb-fix-materialized-dependencies branch from bc95af1 to 5a659f1 Compare August 25, 2021 23:40
@RyanBrushett RyanBrushett merged commit 2b1c8a2 into main Aug 26, 2021
@RyanBrushett RyanBrushett deleted the ryanb-fix-materialized-dependencies branch August 26, 2021 02:05
paracycle pushed a commit that referenced this pull request Aug 26, 2021
paracycle pushed a commit that referenced this pull request Aug 26, 2021
@shopify-shipit shopify-shipit bot temporarily deployed to production September 7, 2021 16:35 Inactive
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants