Skip to content

Commit gyb-generated files to master #159

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Oct 25, 2019
Merged

Commit gyb-generated files to master #159

merged 4 commits into from
Oct 25, 2019

Conversation

ahoppen
Copy link
Member

@ahoppen ahoppen commented Oct 22, 2019 •
edited
Loading

After some discussion we have decided that we would like to commit all gyb-generated files into master to allow depending on SwiftSyntax’s master branch through a SwiftPM dependency. The workflow shall look like:

  • We remove the .gitignore from the gyb_generated directory and always commit the generated files
  • In PR testing, Swift CI will verify that the generated files match the current state of the Swift and SwiftSyntax repositories, any mismatch will be a CI failure
  • Hence it’s not possible to generate an outdated version of the generated files through any PR on SwiftSyntax
  • If the gyb_syntax_support in the main swift repository changes without updating the generated files this will result in a CI failure of the continuous job that needs to be fixed.

@ahoppen ahoppen mentioned this pull request Oct 22, 2019
Merged
@ahoppen
Copy link
Member Author

ahoppen commented Oct 23, 2019

@swift-ci Please test

@ahoppen ahoppen requested a review from nkcsgexi October 23, 2019 22:13
@ahoppen ahoppen changed the title WIP: Commit gyb-generated files to master Commit gyb-generated files to master Oct 23, 2019
@ahoppen ahoppen force-pushed the generated-in-master branch from 408a65a to 70acce6 Compare October 23, 2019 23:54
@ahoppen
Copy link
Member Author

ahoppen commented Oct 24, 2019

@swift-ci Please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 408a65a

@ahoppen ahoppen merged commit d0d86a1 into swiftlang:master Oct 25, 2019
@ahoppen ahoppen deleted the generated-in-master branch October 25, 2019 18:34
adevress pushed a commit to adevress/swift-syntax that referenced this pull request Jan 14, 2024
@allevato
Merge pull request swiftlang#159 from dylansturg/selector_so_long
ce6a169 
Add breaks around selector expressions.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akyrtzi akyrtzi akyrtzi approved these changes

@nkcsgexi nkcsgexi nkcsgexi approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ahoppen @swift-ci @akyrtzi @nkcsgexi