Check if levelbuilder is ahead of staging before doing DTS#55152
Merged
Conversation
breville
approved these changes
Nov 27, 2023
breville
left a comment
Member
There was a problem hiding this comment.
Great work! Thanks for doing this.
Hamms
approved these changes
Nov 27, 2023
davidsbailey
added a commit
that referenced
this pull request
Nov 27, 2023
* Updated the dance-ai course video. * hoc2023: fix code flip * Fix authored hint lightbulb number circle in RTL (#55087) Fix authored hint lightbulb number circle in RTL * Updates to teacher application emails for 2024-2025 school year (#54998) * Most updates to teacher application emails for 2024-2025 * Finish updates to need_admin_approval email * Minor updates * Updates to accepted email * PR feedback * Small update to wording * minitoolbox open by default (#55151) * [JIMT][Dance AI Modal refactoring] (#55089) * jimt/dance-ai-modal-refactoring - broke up utils.ts file; move types to ai/types * jimt/dance-ai-modal-refactoring - pulled all functions out of DanceAiModal * jimt/dance-ai-modal-refactoring - changed types import * jimt/dance-ai-modal-refactoring - changed types import * jimt/dance-ai-modal-refactoring - renaming of methods * jimt/dance-ai-modal-refactoring - validateAndSetFieldValue now accepts a logger * jimt/dance-ai-modal-refactoring renamed logger -> invalidValueLogger * jimt/dance-ai-modal-refactoring - renamed ai/types -> ai/ai-types * jimt/dance-ai-modal-refactoring - retooled to remove field param in favor of logValues * jimt/dance-ai-modal-refactoring - restores field key * jimt/dance-ai-modal-refactoring - moved ai-types back to types * jimt/dance-ai-modal-refactoring - message/value non-optional and exported * HoC 2023 - Fix Dance AI homepage hero banner (#55154) * add dance ai hero banner to homepage.json again * add styles with z-index fix * Check if levelbuilder is ahead of staging before doing DTS (#55152) --------- Co-authored-by: Jessica Kulwik <jessica@code.org> Co-authored-by: breville <brendan@code.org> Co-authored-by: fisher-alice <107423305+fisher-alice@users.noreply.github.com> Co-authored-by: Bethany Connor <46464143+bethanyaconnor@users.noreply.github.com> Co-authored-by: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Co-authored-by: Brendan Reville <breville@users.noreply.github.com> Co-authored-by: Jim Thomason <jim.thomason@code.org> Co-authored-by: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com>
davidsbailey
added a commit
that referenced
this pull request
Nov 27, 2023
* HoC 2023 - Add Dance AI tutorial to marketing website (#55060) * update link on /dance * add tile to /ai * add media-wrapper around img on /dance * HoC 2023 - Code.org - set Dance Party AI hero banner live (#55064) * add responsive styles * update primary link to /dance for soon-hoc * HoC 2023 - Add Dance Party AI skinny banners to code.org (#55091) * add dance_party_ai_skinny_banner.haml view * add banner to /teach * add to /ai/index.haml * add to /ai/how-ai-works * add to /ai/pl/101 * add responsive styles * clean up css * HoC 2023 - Add Dance Party AI side-by-side announcement banners (#55099) * add banner to announcements.json * add strings to marketing_announcements.json * add banner to SpecialAnnouncement.jsx on student homepage * refactor SpecialAnnouncement.jsx component removed logic to differentiate between teacher and student and made it show for all languages * Add tile for self-paced Teaching Interactive Animations and Games PL (#55029) * tile update * new tile page * update image and add aria labels --------- Co-authored-by: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> * staging content changes (-robo-commit) * Update en.yml - Add Dance Party: AI Edition strings * staging content changes (-robo-commit) * Revert "HoC 2023 - Code.org - set Dance Party AI hero banner live (#55064)" (#55149) This reverts commit b1c16f1. * manual DTT (Staging > Test) (#55160) * Updated the dance-ai course video. * hoc2023: fix code flip * Fix authored hint lightbulb number circle in RTL (#55087) Fix authored hint lightbulb number circle in RTL * Updates to teacher application emails for 2024-2025 school year (#54998) * Most updates to teacher application emails for 2024-2025 * Finish updates to need_admin_approval email * Minor updates * Updates to accepted email * PR feedback * Small update to wording * minitoolbox open by default (#55151) * [JIMT][Dance AI Modal refactoring] (#55089) * jimt/dance-ai-modal-refactoring - broke up utils.ts file; move types to ai/types * jimt/dance-ai-modal-refactoring - pulled all functions out of DanceAiModal * jimt/dance-ai-modal-refactoring - changed types import * jimt/dance-ai-modal-refactoring - changed types import * jimt/dance-ai-modal-refactoring - renaming of methods * jimt/dance-ai-modal-refactoring - validateAndSetFieldValue now accepts a logger * jimt/dance-ai-modal-refactoring renamed logger -> invalidValueLogger * jimt/dance-ai-modal-refactoring - renamed ai/types -> ai/ai-types * jimt/dance-ai-modal-refactoring - retooled to remove field param in favor of logValues * jimt/dance-ai-modal-refactoring - restores field key * jimt/dance-ai-modal-refactoring - moved ai-types back to types * jimt/dance-ai-modal-refactoring - message/value non-optional and exported * HoC 2023 - Fix Dance AI homepage hero banner (#55154) * add dance ai hero banner to homepage.json again * add styles with z-index fix * Check if levelbuilder is ahead of staging before doing DTS (#55152) --------- Co-authored-by: Jessica Kulwik <jessica@code.org> Co-authored-by: breville <brendan@code.org> Co-authored-by: fisher-alice <107423305+fisher-alice@users.noreply.github.com> Co-authored-by: Bethany Connor <46464143+bethanyaconnor@users.noreply.github.com> Co-authored-by: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Co-authored-by: Brendan Reville <breville@users.noreply.github.com> Co-authored-by: Jim Thomason <jim.thomason@code.org> Co-authored-by: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> --------- Co-authored-by: Jessica Kulwik <jessica@code.org> Co-authored-by: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Co-authored-by: Code.org Deploy Systems <dev@code.org> Co-authored-by: Dmytro Antonyuk <137330041+dmantonyuk@users.noreply.github.com> Co-authored-by: Tanya Parker <tanya@code.org> Co-authored-by: Brendan Reville <breville@users.noreply.github.com> Co-authored-by: breville <brendan@code.org> Co-authored-by: fisher-alice <107423305+fisher-alice@users.noreply.github.com> Co-authored-by: Bethany Connor <46464143+bethanyaconnor@users.noreply.github.com> Co-authored-by: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Co-authored-by: Jim Thomason <jim.thomason@code.org>
davidsbailey
pushed a commit
that referenced
this pull request
Nov 27, 2023
* Updated the dance-ai course video. * hoc2023: fix code flip * Fix authored hint lightbulb number circle in RTL (#55087) Fix authored hint lightbulb number circle in RTL * Updates to teacher application emails for 2024-2025 school year (#54998) * Most updates to teacher application emails for 2024-2025 * Finish updates to need_admin_approval email * Minor updates * Updates to accepted email * PR feedback * Small update to wording * minitoolbox open by default (#55151) * [JIMT][Dance AI Modal refactoring] (#55089) * jimt/dance-ai-modal-refactoring - broke up utils.ts file; move types to ai/types * jimt/dance-ai-modal-refactoring - pulled all functions out of DanceAiModal * jimt/dance-ai-modal-refactoring - changed types import * jimt/dance-ai-modal-refactoring - changed types import * jimt/dance-ai-modal-refactoring - renaming of methods * jimt/dance-ai-modal-refactoring - validateAndSetFieldValue now accepts a logger * jimt/dance-ai-modal-refactoring renamed logger -> invalidValueLogger * jimt/dance-ai-modal-refactoring - renamed ai/types -> ai/ai-types * jimt/dance-ai-modal-refactoring - retooled to remove field param in favor of logValues * jimt/dance-ai-modal-refactoring - restores field key * jimt/dance-ai-modal-refactoring - moved ai-types back to types * jimt/dance-ai-modal-refactoring - message/value non-optional and exported * HoC 2023 - Fix Dance AI homepage hero banner (#55154) * add dance ai hero banner to homepage.json again * add styles with z-index fix * Check if levelbuilder is ahead of staging before doing DTS (#55152) * Updates native name for the Filipino language for dashboard. This is to correspond to the change made for pegasus pages. * move event (#55106) * Fix discrepencies in Hour of Code event counts (#55075) * log new event counts * switch page triggers tally * tally using events_by_country * add puts statements * comment out slow section * require forms * take away testing puts statements * remove changes to yourschool * remove extra space --------- Co-authored-by: Jessica Kulwik <jessica@code.org> Co-authored-by: breville <brendan@code.org> Co-authored-by: fisher-alice <107423305+fisher-alice@users.noreply.github.com> Co-authored-by: Bethany Connor <46464143+bethanyaconnor@users.noreply.github.com> Co-authored-by: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Co-authored-by: Brendan Reville <breville@users.noreply.github.com> Co-authored-by: Jim Thomason <jim.thomason@code.org> Co-authored-by: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Co-authored-by: wilkie <wilkie05@gmail.com> Co-authored-by: wilkie <david.wilkinson@code.org> Co-authored-by: Turner Riley <56283563+TurnerRiley@users.noreply.github.com>
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
3 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.
Almost every holiday weekend, the DTS fails and staging is auto-closed due to there being nothing to merge from levelbuilder -> staging. I've been surprised that we don't handle this case, so I did a little bit of digging, and it turns out we have been checking if
stagingis ahead oflevelbuilder(iestaginghas commits thatlevelbuilderdoes not) before doing a DTS rather than checking iflevelbuilderis ahead ofstaging(ielevelbuilderhas commits thatstagingdoes not). We only want to perform a DTS if there is new content on the levelbuilder branch.I did not run
merge_lb_to_staginglocally but I did run the newahead?method locally and it worked as expected.