Skip to content

sync main to beta#623

Merged
steveseguin merged 4 commits into
betafrom
main
Sep 21, 2025
Merged

sync main to beta#623
steveseguin merged 4 commits into
betafrom
main

Conversation

@steveseguin

@steveseguin steveseguin commented Sep 21, 2025

Copy link
Copy Markdown
Owner

Sync main to beta

Purpose

This Pull Request aims to synchronize the beta branch with the current state of the main branch. The primary goal is to ensure that the beta branch contains all the latest stable features, bug fixes, and performance improvements that have been merged into main since the last synchronization. This provides a robust and up-to-date foundation for continued development, pre-release testing, and the integration of new features intended for the next release cycle within the Raspberry Ninja project.

Key Changes

This PR itself does not introduce new code features or bug fixes directly but rather incorporates all changes from main. Specifically, this includes:

  • All individual commits and their associated changes that have been merged into main since beta was last brought up to date.
  • This encompasses any new features, bug fixes, refactorings, API updates, UI enhancements, and documentation changes that have landed in main.
  • The exact scope of these changes can be reviewed by examining the commit history of the main branch since the last merge point with beta.

Context / Why

Keeping the beta branch in sync with main is a critical step in our development workflow. It helps to:

  • Prevent significant divergence between the branches, which can lead to complex merge conflicts later.
  • Ensure that pre-release testing on beta is conducted against the most current stable codebase.
  • Provide a consistent and up-to-date base for developers working on features specifically for beta or future releases, minimizing the risk of building on outdated code.

How to Test

Reviewers should perform comprehensive smoke tests and sanity checks on the beta branch after this merge.

  1. Pull the beta branch locally:
    git checkout beta
    git pull origin beta
  2. Run the Raspberry Ninja application: Start the server and client components.
  3. Verify Core Functionality:
    • Test social stream integration (Twitch, YouTube, etc.) to ensure messages and events are received.
    • Check overlay functionality (text, images, alerts) is rendering correctly.
    • Validate TTS (Text-to-Speech) works as expected.
    • Test key API endpoints (if applicable) to ensure they are responsive and return correct data.
    • Interact with any other major features of the project to confirm stability.
  4. Look for Regressions: Pay close attention to any existing features that might have been impacted or have stopped working as expected.
  5. Review Recent main Changes (if known): If specific features or fixes were recently landed on main, explicitly test those to ensure they are now present and functional in beta.

Considerations

  • While this PR primarily consists of bringing beta up to speed, careful review is still important to catch any unexpected interactions or regressions.
  • Any automatic merge resolutions should be noted, although Git typically handles these silently for simple fast-forward merges or straightforward divergences.

steveseguin and others added 4 commits September 13, 2025 13:31
…error

- Changed iframe label from 'giveaway' to 'dock' to properly receive chat messages
- Removed stray 'ss' text that was causing JavaScript reference error
- Giveaway widget now successfully receives and processes chat data from Social Stream
- New OBS widget that displays giveaway entrants in a spinning wheel format
- Receives chat data via Social Stream iframe connection
- Features interactive wheel spinning animation for winner selection
- Includes confetti effects and winner announcement display
@steveseguin
steveseguin merged commit c99e79d into beta Sep 21, 2025
4 checks passed
@CLAassistant

Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ steveseguin
❌ Social Stream User


Social Stream User seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

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.

2 participants