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.

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

build/package/ship soh.otr #2699

Merged
merged 55 commits into from
Apr 13, 2023

Conversation

briaguya-ai
Copy link
Contributor

@briaguya-ai briaguya-ai commented Apr 12, 2023

in order to not require generating new oot.otr and oot-mq.otr files every time we add ship-specific assets, it has been decided that we should ship soh with a ship specific asset archive soh.otr

this PR builds on #2380, but:

  • latest dev has been merged in
  • LUS has been bumped to use App Bundle Paths Kenix3/libultraship#162, which will be required to support soh.otr inside mac app bundles and linux appimages
  • the github workflows have been updated
    • a new step generating soh.otr has been added to the beginning of the workflow
    • windows no longer uses cpack (this removes the zipped zip issue)
    • windows now ships an soh.otr in the zip
    • wii u now ships an soh.otr in the zip
    • switch now ships an soh.otr in the zip
    • linux now ships an soh.otr in the appimage
      • linux appimage builds work with soh.otr living inside the appimage
      • appimage otr gen script only tries to generate oot.otr and oot-mq.otr
    • mac now ships an soh.otr in the app bundle

what is left to do?

  • for this PR
    • general
      • use LUS main
    • platform specific
      • i think we're good
  • can wait
    • windows
      • remove raw assets from zip
      • don't ship OTRGui, generate otrs from soh
    • mac
      • remove raw assets from app bundle
      • verify we can generate oot.otr and oot-mq.otr without any of the assets
    • linux
      • remove raw assets from appimage
      • verify we can generate oot.otr and oot-mq.otr without any of the assets

Build Artifacts

@briaguya-ai briaguya-ai added the do not merge Not ready or not valid changes label Apr 12, 2023
@briaguya-ai briaguya-ai removed the do not merge Not ready or not valid changes label Apr 13, 2023
@louist103 louist103 merged commit c4ce2f1 into HarbourMasters:develop Apr 13, 2023
@briaguya-ai briaguya-ai deleted the sohotr-packaging branch April 22, 2023 17:57
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.

3 participants