Committing code to the codebase at Stage
Editing Code
- Check out Master and pull
- Create a new branch (ex. JMP-org-page-craig)
- Track new branch to origin/master
- Make changes to new branch
- Make a Pull in the new branch – make sure it's up to date
- Make necessary changes
- Command + S to Save in Nova
- CodeKit- compiled successfully
Staging changes
- Click File Status in left column of the workspace
- Navigate to Unstaged changes Box
- Click checkbox and they will move to Staged
- Double check whether to discard or stage these files (For example – may want to ignore certain file types)
- Make a commit comment (JMP – etc...) - realistically descriptive as possible
- Checkbox – Push changes immediately
- Click commit
- Before pushing changes to production
- wait for a Successful Build Notification in your Email
Pushing design changes from Stage to Prod
Sourcetree
- After successful commit on checked out branch, test changes and ensure a successful build.
- Check out Master
- Pull – commit merged changes immediately
- While Master is checked out
- navigate to branch you want to merge
- Right click – Merge ("branch name") into Master
- Confirm Merge – commit merged changes immediately
- Push Master
Jenkins
- Log in to Jenkins https://aembuild.unx.sas.com/view/AEM-Design/
- Click Individual Design towards bottom of right column
- Click build with Parameters in the left column – Pipeline Individual Design
- BUILDENV – aemauthor (for building to Prod author)
- Packagedesign – jmp (or applicable design)
- Comments – (environment/design) ex. - aemauthor/jmp - then (comments)
- Double check settings
- Click Build
- Wait for Successful notification – Individual design build
AEM Tools – Designs
