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

Mage conversion #2652

Merged
merged 5 commits into from
Jul 26, 2023
Merged

Conversation

nitishchauhan0022
Copy link
Contributor

@nitishchauhan0022 nitishchauhan0022 commented Jul 8, 2023

Fixes #2511

Special notes for your reviewer:

┆Issue is synchronized with this Jira Task by Unito

@Sharpz7
Copy link
Contributor

Sharpz7 commented Jul 11, 2023

This looks really really good!

I will make sure to review it over the coming days.

Maybe we can comment out the make file equivalent if you have implemented it / is doesn't need to exist anymore? Just for tracking purposes.

@nitishchauhan0022
Copy link
Contributor Author

@Sharpz7 thanks, I have nearly covered every command, 1-2 commands are remaining, will add them soon

@kannon92
Copy link
Contributor

This looks really really good!

I will make sure to review it over the coming days.

Maybe we can comment out the make file equivalent if you have implemented it / is doesn't need to exist anymore? Just for tracking purposes.

+1 for this. I'd love to switch over our github actions to use these mage targets so we can phase out the make file.

@nitishchauhan0022 Are you up for that?

@nitishchauhan0022
Copy link
Contributor Author

@kannon92 yep! i can take that.

@Sharpz7
Copy link
Contributor

Sharpz7 commented Jul 13, 2023

@kannon92 yep! i can take that.

Great! Looking forward to reviewing. Note that by using the mage targets in the CI you can have higher confidence that they have been implemented correctly :))

@nitishchauhan0022
Copy link
Contributor Author

@Sharpz7 definitely, will work on this this weekend.

Note that by using the mage targets in the CI you can have higher confidence that they have been implemented correctly :))

makefile Outdated Show resolved Hide resolved
.github/workflows/go.yml Outdated Show resolved Hide resolved
@@ -33,7 +33,7 @@ jobs:
- name: Save docker images to artifact
run: |
mkdir -p docker-images
docker save armada | gzip > docker-images/armada.tar.gz
docker save armada-server | gzip > docker-images/armada-server.tar.gz
Copy link
Contributor

Choose a reason for hiding this comment

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

How is this related? @richscott or @dejanzele would this break anything?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

we can rename the gorelease armada-server output to armada if needed. But as that was added already, i made the change here.

@kannon92
Copy link
Contributor

I find the rebase notifications to be hard to find so just want you to let you know that you should rebase!

@nitishchauhan0022
Copy link
Contributor Author

hey @kannon92 @Sharpz7 can we have this pr merge #2622

@kannon92
Copy link
Contributor

hey @kannon92 @Sharpz7 can we have this pr merge #2622

We have some questions for @ClifHouck on that PR so its not quite ready to merge yet.

@Sharpz7
Copy link
Contributor

Sharpz7 commented Jul 19, 2023

@nitishchauhan0022 we also have more CI tests, but we are only able to enable them on this PR for you if you resolve the merge conflicts.

Thanks :))

@kannon92
Copy link
Contributor

hey @kannon92 @Sharpz7 can we have this pr merge #2622

We have some questions for @ClifHouck on that PR so its not quite ready to merge yet.

I decided to merge @ClifHouck PR actually so you should get his changes when you rebase.

@Sharpz7
Copy link
Contributor

Sharpz7 commented Jul 22, 2023

That is CI enabled for you. If this passes we should be good to go with all other comments addressed.

@nitishchauhan0022 nitishchauhan0022 force-pushed the mage-conversion branch 2 times, most recently from 78b1613 to 5bf0b88 Compare July 23, 2023 05:28
Signed-off-by: ntishchauhan0022 <nitishchauhan0022@gmail.com>
Signed-off-by: ntishchauhan0022 <nitishchauhan0022@gmail.com>
@nitishchauhan0022
Copy link
Contributor Author

PTAL @Sharpz7 @kannon92 CI tests have passed.

Signed-off-by: ntishchauhan0022 <nitishchauhan0022@gmail.com>
@codecov
Copy link

codecov bot commented Jul 24, 2023

Codecov Report

Patch and project coverage have no change.

Comparison is base (d7e5a05) 16.21% compared to head (9c76760) 16.21%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #2652   +/-   ##
=======================================
  Coverage   16.21%   16.21%           
=======================================
  Files         160      160           
  Lines       12559    12559           
  Branches      487      487           
=======================================
  Hits         2037     2037           
  Misses      10353    10353           
  Partials      169      169           
Flag Coverage Δ
unittests 16.21% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@kannon92
Copy link
Contributor

Please fix the merge conflicts. After that I think this is mergable.

@Sharpz7 Sharpz7 enabled auto-merge (squash) July 26, 2023 15:57
@Sharpz7 Sharpz7 merged commit b57c175 into armadaproject:master Jul 26, 2023
25 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.

Replace Make targets with Mage targets
3 participants