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

merge main into monorepo for hydrate enhancements v0.5.0 #30

Merged
merged 3 commits into from
Apr 21, 2023

Conversation

alaincormier-ssc
Copy link
Contributor

@alaincormier-ssc alaincormier-ssc commented Apr 21, 2023

merge main (0.5.0 - hydrate enhancements) into monorepo

to address future merge conflicts

alaincormier-ssc and others added 3 commits April 21, 2023 08:50
* add monorepo compatibility, error handling and option to automatically push changes

* fix hydrate.sh linting

* fix hydrate.sh linting

* add logic in validate-yaml.sh to handle branch names

* cleanup comments, add tests for certain conditions

* handle multiple setters validation error within same directory

* add set-upsteam to git push

* cleanup comments, rename all functions with underscores for consistency

* specify dir when running git status
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@alaincormier-ssc alaincormier-ssc marked this pull request as ready for review April 21, 2023 13:12
@alaincormier-ssc alaincormier-ssc changed the title Merge main - 0.5.0 hydrate enhancements merge main into monorepo for hydrate enhancements (0.5.0) Apr 21, 2023
@alaincormier-ssc alaincormier-ssc changed the title merge main into monorepo for hydrate enhancements (0.5.0) merge main into monorepo for hydrate enhancements v0.5.0 Apr 21, 2023
@davelanglois-ssc davelanglois-ssc merged commit b3bf833 into monorepo Apr 21, 2023
@davelanglois-ssc davelanglois-ssc deleted the merge-main-hydrate branch April 21, 2023 17:27
@alaincormier-ssc alaincormier-ssc restored the merge-main-hydrate branch April 21, 2023 18:16
@alaincormier-ssc alaincormier-ssc deleted the merge-main-hydrate branch April 21, 2023 18:36
@alaincormier-ssc alaincormier-ssc restored the merge-main-hydrate branch April 24, 2023 10:38
@alaincormier-ssc alaincormier-ssc deleted the merge-main-hydrate branch April 24, 2023 14:51
Michael-McAuley-SSC added a commit that referenced this pull request Sep 22, 2023
* feat!: monorepo tagging solution

implements the tagging solution when using monorepos. It completely overwrites the original tagging pipeline/script.

* merge main into monorepo for hydrate enhancements v0.5.0 (#30)

* feat: hydrate enhancement (#27)

* add monorepo compatibility, error handling and option to automatically push changes

* fix hydrate.sh linting

* fix hydrate.sh linting

* add logic in validate-yaml.sh to handle branch names

* cleanup comments, add tests for certain conditions

* handle multiple setters validation error within same directory

* add set-upsteam to git push

* cleanup comments, rename all functions with underscores for consistency

* specify dir when running git status

* chore(main): release 0.5.0 (#29)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Feat kpt tools (#42)

* new tools

* separating the inventory function than the doc generation

* removed old code from inventory-controls.py

* fix: linting

* prettyfying

* adding divider

* new bind mount in docker compose

* fix rm statement

* fixing linting error in version-tagging.sh

* cleaner script header

* new comments

* fixing comments

* fixed bashrc

* fix kpt instruction from generate docs

* adressing comments

* fix: results column in hydrate and kpt-push (#50)

* fixed results column in hydrate and kpt-push

* revert kpt version to 21

---------

Co-authored-by: alaincormier-ssc <94859304+alaincormier-ssc@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Michael <michael.mcauley2@ssc-spc.gc.ca>
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