Skip to content
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

CI: Remove dependency on packagesbuild and use native Xcode tools #92

Merged
merged 1 commit into from
Oct 26, 2023
Merged

CI: Remove dependency on packagesbuild and use native Xcode tools #92

merged 1 commit into from
Oct 26, 2023

Conversation

PatTheMav
Copy link
Member

@PatTheMav PatTheMav commented Sep 25, 2023 •
edited
Loading

Description

Removes dependency on Packages.app and uses native pkgbuild and productbuild tools to generate installer packages for macOS.

Motivation and Context

As reported in #91, the download for Packages.app is unversioned and the page itself not available via HTTPs. Its developer did a patch/minor version upgrade without putting up a changelog or changing the version number (though admittedly the fix they integrated was valid).

As we only use the command line tool to generate a final installer package, using a distribution file generated by CMake suffices to generate those packages.

Fixes #91.

How Has This Been Tested?

Tested locally with codesigning enabled.

Types of changes

  • Code cleanup (non-breaking change which makes code smaller or more readable)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

@RytoEX
Copy link
Member

RytoEX commented Sep 26, 2023

cc @gxalpha

This was referenced Sep 26, 2023
Closed
Merged
@ubifred ubifred mentioned this pull request Oct 9, 2023
Closed
@RytoEX
Copy link
Member

RytoEX commented Oct 9, 2023

cc @gxalpha for review

RytoEX
RytoEX reviewed Oct 9, 2023
View reviewed changes
Copy link
Member

@RytoEX RytoEX left a comment

Choose a reason for hiding this comment

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

Should this also remove the packages section from buildspec.json?

obs-plugintemplate/buildspec.json

Lines 34 to 41 in b4a4eb5

"tools": {
"packages": {
"version": "1.2.10",
"baseUrl": "http://s.sudre.free.fr/Software/files",
"label": "Packages.app",
"hash": "6afdd25386295974dad8f078b8f1e41cabebd08e72d970bf92f707c7e48b16c9"
}
},

@PatTheMav
Copy link
Member Author

PatTheMav commented Oct 9, 2023 •
edited
Loading

Should this also remove the packages section from buildspec.json?

obs-plugintemplate/buildspec.json

Lines 34 to 41 in b4a4eb5

"tools": {
"packages": {
"version": "1.2.10",
"baseUrl": "http://s.sudre.free.fr/Software/files",
"label": "Packages.app",
"hash": "6afdd25386295974dad8f078b8f1e41cabebd08e72d970bf92f707c7e48b16c9"
}
},

It's effectively ignored by the changes, but doesn't hurt to remove it as well.

The UUIDs for macOS can also be removed now because they were only required by Packages, the built-in tools do not require this and use pkg-ref as identifier it seems.

@RytoEX
Copy link
Member

RytoEX commented Oct 9, 2023

Should this also remove the packages section from buildspec.json?

obs-plugintemplate/buildspec.json

Lines 34 to 41 in b4a4eb5

"tools": {
"packages": {
"version": "1.2.10",
"baseUrl": "http://s.sudre.free.fr/Software/files",
"label": "Packages.app",
"hash": "6afdd25386295974dad8f078b8f1e41cabebd08e72d970bf92f707c7e48b16c9"
}
},

It's effectively ignored by the changes, but doesn't hurt to remove it as well.

The UUIDs for macOS can also be removed now because they were only required by Packages, the built-in tools do not require this and use pkg-ref as identifier it seems.

I just don't want someone being confused by it or reporting an outdated package/tool when we don't use it.

@PatTheMav PatTheMav force-pushed the remove-packagesbuild branch from 18cdf0c to c380ee2 Compare October 9, 2023 19:11
@PatTheMav PatTheMav force-pushed the remove-packagesbuild branch from c380ee2 to 3e52220 Compare October 9, 2023 19:19
@umireon umireon mentioned this pull request Oct 10, 2023
Merged
@PatTheMav
Copy link
Member Author

@RytoEX please revisit this so it can be merged soon-ish, I'd like to unbreak the repo.

RytoEX
RytoEX approved these changes Oct 26, 2023
View reviewed changes
Copy link
Member

@RytoEX RytoEX left a comment

Choose a reason for hiding this comment

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

Seems fine.

@RytoEX RytoEX merged commit cff11c6 into obsproject:master Oct 26, 2023
@PatTheMav PatTheMav deleted the remove-packagesbuild branch October 26, 2023 22:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RytoEX RytoEX RytoEX approved these changes

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

Successfully merging this pull request may close these issues.

MacOS Build packaging failing due to checksum for Packages.dmg no longer matching expected checksum.
2 participants
@PatTheMav @RytoEX