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

Split Build Steps for PG into seperate files. macOS / VS now should be easily built #450

Merged
merged 55 commits into from
Dec 18, 2023

Conversation

danoli3
Copy link
Member

@danoli3 danoli3 commented Dec 15, 2023

Split up dev script code and ci code.
Now user can install... build and generate the cmd project / test / build electron all as separate steps controlled by script.

  • Update Electron to Latest. NPM to Latest (fixes bitcode on macOS)

  • Added VS front end gui building with output to projectGenerator-vs-gui to be added to releases

  • Added security code from apothecary been thinking about that does a checksum of the binary target, stores build time, and git version etc

  • macOS / VS command line builds as split the PG .sh

  • MacOS split some code out PGBuild
  • Updated github actions
  • Optimised size of build to switching to Electron Distribution
  • Reworked packages.json to support new system

-TODO linux
TODO validate existing notorization and upload to apple for macOS is still working

Project generator

"dist": "electron-builder",
"dist:mac:x64": "NODE_ENV=production electron-builder --mac --x64 ",
"dist:mac:arm64": "NODE_ENV=production electron-builder --mac --arm64",
"dist:mac:universal": "NODE_ENV=production electron-builder --mac --universal",
Copy link
Member

Choose a reason for hiding this comment

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

just a heads up - this link from build:macos is super important:
--arch=universal --osxUniversal.x64ArchFiles=Contents/Resources/app/app/projectGenerator",

otherwise universal PG won't work.

Copy link
Member Author

Choose a reason for hiding this comment

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

Amazing yeah was some issues with that! Updated now and all seems to be working on both platforms

@danoli3
Copy link
Member Author

danoli3 commented Dec 15, 2023

Okay this is looking good! Just need to test the CI upload really now!
I might make some changes in workflow and test in a temp bleeding branch if that's all g?

I've manually added them here:
https://github.com/danoli3/projectGenerator/releases/tag/nightly

@danoli3
Copy link
Member Author

danoli3 commented Dec 15, 2023

@ofTheo could you make a bleeding branch on the PG repo and i'll also PR to that and see how it goes with ci
will need a temp bleeding release tag setup also

@ofTheo
Copy link
Member

ofTheo commented Dec 15, 2023

@danoli3 just added - https://github.com/openframeworks/projectGenerator/releases/tag/bleeding
also added you to the repo.

@danoli3
Copy link
Member Author

danoli3 commented Dec 18, 2023

Okay sweet that's all building and deploying via the auto bots

@danoli3 danoli3 requested a review from ofTheo December 18, 2023 15:43
"dist": "electron-builder",
"dist:mac:x64": " electron-builder --mac --x64 --publish never",
"dist:mac:arm64": " electron-builder --mac --arm64 --publish never",
"dist:mac:universal": " electron-builder --mac --universal --publish never",
Copy link
Member

@ofTheo ofTheo Dec 18, 2023

Choose a reason for hiding this comment

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

does this in turn call build:mac below ?
is that where the:

   "mergeASARs": false,
       "x64ArchFiles": "Contents/Resources/app/app/projectGenerator"

are getting included from?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah all the mac:x calls use the mac { }.
The only one being used though in ci currently is dist:mac:universal

Copy link
Member

Choose a reason for hiding this comment

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

okay - awesome.
looks good to me then!! 👍

@ofTheo ofTheo merged commit 63975db into openframeworks:master Dec 18, 2023
6 checks passed
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