Skip to content

Conversation

@Piinks
Copy link
Contributor

@Piinks Piinks commented Jul 22, 2019

Description

Local golden file changes should not exist on Cirrus, but were introduced in the reverted PR #33688. This removes those local changes that are creating a sync error for the goldens repository on cirrus, and maintains a safe guard against further errant local changes, thereby preserving the testing environment.

The fingerprint script for cirrus has been updated to incorporate the goldens version when deciding to invalidate the cache or not.

Related Issues

This blocks #36087 and any further updates to the goldens repository.

Checklist

Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes ([x]). This will ensure a smooth and quick review process.

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I signed the CLA.
  • I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
  • I updated/added relevant documentation (doc comments with ///).
  • All existing and new tests are passing.
  • The analyzer (flutter analyze --flutter-repo) does not report any problems on my PR.
  • I am willing to follow-up on review comments in a timely manner.

Breaking Change

Does your PR require Flutter developers to manually update their apps to accommodate your change?

  • No, this is not a breaking change.

@fluttergithubbot
Copy link
Contributor

It looks like this pull request may not have tests. Please make sure to add tests before merging. While there are exceptions to this rule, if this patch modifies code it is probably not an exception.

Reviewers: Read the Tree Hygine page and make sure this patch meets those guidelines before LGTMing.

/cc @dnfield

}

Future<void> _checkCanSync() async {
final bool isCirrus = (platform.environment['CIRRUS_CI'] ?? '').isNotEmpty;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I think we check this elsewhwer as just platform.environment.containsKey('CIRRUS_CI')

@Piinks Piinks added framework flutter/packages/flutter repository. See also f: labels. a: tests "flutter test", flutter_test, or one of our tests labels Jul 22, 2019
@Piinks Piinks changed the title Preventing local golden changes from persisting on cirrus Updating cirrus fingerprint script to include goldens version Jul 22, 2019
@Piinks Piinks requested a review from dnfield July 22, 2019 18:12
@Piinks
Copy link
Contributor Author

Piinks commented Jul 22, 2019

cc/ @LongCatIsLooong

Copy link
Contributor

@dnfield dnfield left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

flutter_pkg_cache:
folder: bin/cache/pkg
fingerprint_script: echo $OS; cat bin/internal/engine.version
fingerprint_script: echo $OS; cat bin/internal/*.version
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you missed it for other platforms like Windows and macOS

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah good point. Goldens are currently only tested on Linux, but we should keep it consistent regardless. Thanks!

@Piinks Piinks merged commit 0379dd1 into flutter:master Jul 23, 2019
johnsonmh pushed a commit to johnsonmh/flutter that referenced this pull request Jul 30, 2019
@Piinks Piinks deleted the cirrusGoldens branch November 22, 2019 00:52
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 3, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

a: tests "flutter test", flutter_test, or one of our tests framework flutter/packages/flutter repository. See also f: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants