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

chore: add scripts/go.mod and scripts/go.sum to restore upstream #105

Merged
merged 1 commit into from
Feb 5, 2025

Conversation

slashpai
Copy link
Member

@slashpai slashpai commented Feb 5, 2025

No description provided.

@slashpai slashpai requested a review from a team as a code owner February 5, 2025 06:17
@slashpai slashpai enabled auto-merge February 5, 2025 06:46
@slashpai slashpai disabled auto-merge February 5, 2025 06:49
@rexagod
Copy link
Member

rexagod commented Feb 5, 2025

/lgtm

@@ -27,6 +28,8 @@ jobs:
example
go.mod
go.sum
scripts/go.mod
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd like to know more about why those are needed now

Copy link
Member Author

Choose a reason for hiding this comment

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

I tried manually to sync and it there were merge conflicts due to the addition of toolchain go1.23.3 . It should have been added previously too but we don't get much conflict on this so never needed.

https://github.com/prometheus-operator/prometheus-operator/blob/main/scripts/go.mod#L5
https://github.com/openshift/prometheus-operator/blob/main/scripts/go.mod#L5

Copy link
Member Author

Choose a reason for hiding this comment

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

@slashpai slashpai changed the title chore: set default downstream branch as main for prometheus-operator chore: add scripts/go.mod and scripts/go.sum to restore upstream Feb 5, 2025
Copy link
Contributor

@machine424 machine424 left a comment

Choose a reason for hiding this comment

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

lgtm, thanks.

@slashpai slashpai merged commit c06d1d2 into rhobs:main Feb 5, 2025
2 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.

3 participants