Third attempt to add back in CSD resources - #51196
Merged
Merged
Conversation
hannahbergam
changed the title
| } | ||
| }, | ||
| { | ||
| "seeding_key": { |
Contributor
There was a problem hiding this comment.
Git is really getting confused with this diff I see
bethanyaconnor
approved these changes
Apr 7, 2023
bethanyaconnor
left a comment
bethanyaconnor
left a comment
Contributor
There was a problem hiding this comment.
🎉
I think this will work! Two reasons:
- I tested locally and it successfully built 🥳
- I diffed this branch from CSD from before we started this process. I checked out this branch, ran
git diff e0d2628~1 HEAD config/scripts_json/csd[123457]-2023.script_json, using the merge commit from #50906. The diff is at this gist. Everything looks great, except for the URLs of the "All Resources", "All Standards", etc resources are all mixed up (ie csd2 points to csd7). Not sure how that happened but I think we can enlist Dan and Angelina's help next week to sort those out!
Contributor
Author
Oh dang I thought the url diffs in part 2. were intentional because they're all already that way in staging and we did some 'un-numbering' in the middle of this process. I agree that it makes sense to enlist Dan and Angela to figure out how it happened/how to detangle. Thank you for testing this locally and for the review! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I started be reopening the branch that I used to add back in resources (the initial 'part 2' of the project), and deleting the second empty 'lessons_resources' blob that caused all the lessons_resources to get deleted. Theoretically, this would add back in the lessons_resources and any resources that were auto-deleted, and not produce a 'diff' for the other resources that have already been successfully re-added.
This led to a large merge conflict with staging (as predicted), which was made more complicated by the fact that these have all been reordered since the start of the work. I accepted the staging versions whenever unit numbers were involved (see example below). I believe this should now mimic the changes to the files in each csd-2023 script from levelbuilder here: 5540e50#diff-09fb72de2079594a6afcfaf2be6872f1f8af23023a342c7d3295eb4b1e17fda4 as well as the attempt at adding lessons_resources back here that was reverted. I would really appreciate eyes on this, especially with the new complication of different ordering.
I would really like to merge this to staging after the deploy to see if staging will do a clean build. This will allow me to revert quickly if necessary because I believe this is a sticky area, and will prevent it from blocking the deploy.
Links
Testing story
Deployment strategy
Follow-up work
Privacy
Security
Caching
PR Checklist: