Skip to content

CI: Build the plugin based on OBS 31.1 and new QT deps#1318

Closed
Trouffman wants to merge 21 commits into
masterfrom
ci-obs-31.1
Closed

CI: Build the plugin based on OBS 31.1 and new QT deps#1318
Trouffman wants to merge 21 commits into
masterfrom
ci-obs-31.1

Conversation

@Trouffman

@Trouffman Trouffman commented Jul 8, 2025 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Following closely the OBS upstream.

This will be revised fro OBS 32 support.

@Trouffman Trouffman self-assigned this Jul 8, 2025
@Trouffman Trouffman added ci Release Any issue relates to the release process labels Jul 8, 2025
@Trouffman
Trouffman marked this pull request as ready for review July 8, 2025 11:24
@Trouffman

Trouffman commented Jul 9, 2025

Copy link
Copy Markdown
Collaborator Author

Pacing the way for OBS 31.1 will require to update some of the build script too.

This will be put in draft mode until complete

@Trouffman

Trouffman commented Jul 9, 2025

Copy link
Copy Markdown
Collaborator Author

Seems that implementing the changes from PR #1151 helped to build on Windows, still no luck with MacOS.

@Trouffman
Trouffman marked this pull request as draft July 9, 2025 12:45
paulpv
paulpv reviewed Jul 9, 2025
View reviewed changes
Comment thread src/obs-support/remote-text.hpp
@paulpv

paulpv commented Jul 9, 2025

Copy link
Copy Markdown
Member

Seems that implementing the changes from PR #1151 helped to build on Windows, still no luck with MacOS.

macOS fails to build on my MacBook too for this PR; fine for others.
I will also try to investigate...

@paulpv

paulpv commented Jul 10, 2025

Copy link
Copy Markdown
Member

Weird. Adding -DCMAKE_ENABLE_SCRIPTING=OFF for MacOS build (to match Windows) gets past that problem on my MacBook... but not on the CI?

On my MacBook I [unrelated] fiddled with some XCode things awhile ago and now I get the dreaded error:

CMake Error at CMakeLists.txt:5 (project):
  No CMAKE_C_COMPILER could be found.
CMake Error at CMakeLists.txt:5 (project):
  No CMAKE_CXX_COMPILER could be found.

I have followed our dev doc and tried to reset xcode, but still stuck.

@paulpv

paulpv commented Jul 10, 2025

Copy link
Copy Markdown
Member

master builds fine for me.
But on this PR branch building results in the error I mentioned in my previous comment.
I have even completely uninstalled and reinstalled XCode and its Command Line Tools. :/

Must be something more needed to be changed/added to the build scripts.

@paulpv

paulpv commented Jul 10, 2025

Copy link
Copy Markdown
Member

I compared literally all of OBS 31.1.0 to 31.0.4 and don't see any major build changes, so I am drawing a blank on why our 31.0.3 master builds fine but this 31.1.0 PR branch doesn't. :/
There are a few differences; I'll comb through it a bit more.

@paulpv

paulpv commented Jul 10, 2025

Copy link
Copy Markdown
Member

I also diffed both OBS version build scripts to our build scripts and there are a few known differences, but nothing yet obvious that we need to change.

@Trouffman Trouffman changed the title buildspec: bump version to align with OBS 31.1 CI: Build the plugin based on OBS 31.1 and new QT version Jul 12, 2025
@Trouffman Trouffman mentioned this pull request Jul 12, 2025
Closed
@Trouffman
Merge with updates from PR #1251.
8a97303 
Update build CI actions
@Trouffman Trouffman changed the title CI: Build the plugin based on OBS 31.1 and new QT version CI: Build the plugin based on OBS 31.1 and new QT deps Jul 12, 2025
@Trouffman Trouffman mentioned this pull request Jul 12, 2025
Closed
@Trouffman
Trouffman marked this pull request as ready for review July 13, 2025 04:43
@Trouffman

Trouffman commented Jul 13, 2025 •
edited
Loading

Copy link
Copy Markdown
Collaborator Author

This should now be all good :)

I had to fix he OBS code, so we can use our fork until this is merged in OBS upstream

paulpv
paulpv reviewed Jul 13, 2025
View reviewed changes
Comment thread buildspec.json Outdated
@Trouffman
re-add ARM64 for windows in builspec
c948c62 
update cmake to skip frontend
exclude hidden macOS files
@Trouffman

Trouffman commented Jul 13, 2025

Copy link
Copy Markdown
Collaborator Author

@paulpv This implement the fix for allowing the build using the official OBS 31.1.1, the windows ARM64 (Windows-on-ARM) hashes have been added(not used yet but maybe soon).

If this build properly, that should be good to merge.

@Trouffman
Trouffman requested a review from paulpv July 13, 2025 19:05
paulpv
paulpv reviewed Jul 14, 2025
View reviewed changes
Comment thread .github/actions/build-plugin/action.yaml
Comment thread .github/scripts/utils.zsh/check_macos
Comment thread src/config.cpp
{PARAM_TALLY_PREVIEW_ENABLED, OBS_CONFIG_BOOL},
{PARAM_SKIP_UPDATE_VERSION, OBS_CONFIG_STRING}
};
std::map<std::string, enum ObsConfigType> ConfigTypeMap{

@paulpv paulpv Jul 14, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Clean up this formatting (I would expect little to preferrably zero change here)

@Trouffman Trouffman Jul 14, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

This one get overriden by run-clang-format (almost everytime). not sure how to deal with this so its does not mess up the readability everytime

@Trouffman Trouffman Jul 14, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

If using the "readable format" This fails the run-clang-format : https://github.com/DistroAV/DistroAV/actions/runs/16267800395/job/45927465510?pr=1318

Comment thread src/forms/update.cpp
#if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
&QCheckBox::stateChanged,
#else
&QCheckBox::checkStateChanged,

@paulpv paulpv Jul 14, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Indentation problem

@Trouffman Trouffman Jul 14, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I am not a big fan of this anyway, becasue this is at the compile level, not the execution level. Meaning that this only add support for previous version Compile and not really functionnal features.

Will still keep it for now, but we should maybe clean this up regularly, as we move up the OBS verison enforced for the plugin to run.

@Trouffman

Trouffman commented Jul 14, 2025

Copy link
Copy Markdown
Collaborator Author

Added some of the changes found in the upstream OBS.

The more I look into it. The more the plugin-template would need a bunch more love. Not sure when/what is the plan on their side yet.

@Trouffman
Trouffman marked this pull request as draft July 27, 2025 17:43
@Trouffman Trouffman added this to the 6.2.0 milestone Jul 27, 2025
@Trouffman

Trouffman commented Jul 28, 2025

Copy link
Copy Markdown
Collaborator Author

Pulling this back to Draft mode as to align with the recent obs-plugintemplate changes and see how far "ahead" we want to be.

@Trouffman

Trouffman commented Feb 17, 2026

Copy link
Copy Markdown
Collaborator Author

Superseeded by #1406

@Trouffman Trouffman closed this Feb 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@paulpv paulpv paulpv left review comments

Assignees

@Trouffman Trouffman

Labels

ci Release Any issue relates to the release process

Projects

None yet

Milestone

6.2.0

Development

Successfully merging this pull request may close these issues.

2 participants

@Trouffman @paulpv