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

Use goreleaser v2 in CI #23748

Merged
merged 6 commits into from
Dec 3, 2024
Merged

Use goreleaser v2 in CI #23748

merged 6 commits into from
Dec 3, 2024

Conversation

sgress454
Copy link
Contributor

@sgress454 sgress454 commented Nov 12, 2024

for #19530

Replaces #23703, which had a bunch of dependency updates and code changes that I suspect aren't needed because we don't actually use goreleaser in any code, only in CI.

This PR updates Goreleaser to version 2 in CI usage. Updates include:

I was able to run the Docker Publish workflow successfully on this branch. The Orbit workflow ran successfully as well.

Copy link

codecov bot commented Nov 12, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 63.44%. Comparing base (a0b03b0) to head (240e639).
Report is 26 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff            @@
##             main   #23748    +/-   ##
========================================
  Coverage   63.44%   63.44%            
========================================
  Files        1582     1578     -4     
  Lines      150371   150025   -346     
  Branches     3805     3612   -193     
========================================
- Hits        95405    95189   -216     
+ Misses      47369    47243   -126     
+ Partials     7597     7593     -4     
Flag Coverage Δ
backend 64.31% <100.00%> (ø)

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.

@sgress454 sgress454 marked this pull request as ready for review November 12, 2024 22:24
Comment on lines -78 to +79
version: "~> 1"
args: release --rm-dist -f .goreleaser.yml
version: "~> 2"
args: release --clean -f .goreleaser.yml
Copy link
Contributor Author

Choose a reason for hiding this comment

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

run: go run github.com/goreleaser/goreleaser@56c9d09a1b925e2549631c6d180b0a1c2ebfac82 release --debug --rm-dist --skip-publish -f orbit/goreleaser-macos.yml # v1.20.0
run: go run github.com/goreleaser/goreleaser/v2@606c0e724fe9b980cd01090d08cbebff63cd0f72 release --verbose --clean --skip=publish -f orbit/goreleaser-macos.yml # v1.20.0
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

You should update the version comment (# v1.20.0) to reflect what new version this git hash 606c0e724fe9b980cd01090d08cbebff63cd0f72 refers to.

Comment on lines -139 to +141
name_template: "{{ .Tag }}-untagged"
version_template: "{{ .Tag }}-untagged"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Comment on lines -142 to +144
skip: true
disable: true
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Member

@mna mna left a comment

Choose a reason for hiding this comment

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

LGTM, just the version comment to update.

run: go run github.com/goreleaser/goreleaser@56c9d09a1b925e2549631c6d180b0a1c2ebfac82 release --debug --rm-dist --skip-publish -f orbit/goreleaser-macos.yml # v1.20.0
run: go run github.com/goreleaser/goreleaser/v2@606c0e724fe9b980cd01090d08cbebff63cd0f72 release --verbose --clean --skip=publish -f orbit/goreleaser-macos.yml # v1.20.0
Copy link
Member

Choose a reason for hiding this comment

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

You should update the version comment (# v1.20.0) to reflect what new version this git hash 606c0e724fe9b980cd01090d08cbebff63cd0f72 refers to.


- name: Run GoReleaser
run: go run github.com/goreleaser/goreleaser@56c9d09a1b925e2549631c6d180b0a1c2ebfac82 release --debug --rm-dist --skip-publish -f orbit/goreleaser-linux.yml # v1.20.0
run: go run github.com/goreleaser/goreleaser/v2@606c0e724fe9b980cd01090d08cbebff63cd0f72 release --verbose --clean --skip=publish -f orbit/goreleaser-linux.yml # v1.20.0
Copy link
Member

Choose a reason for hiding this comment

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

Same here for the version comment (and elsewhere where the hash was changed).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good catch, thanks! fixed.

@@ -53,7 +53,6 @@ require (
github.com/google/go-cmp v0.6.0
github.com/google/go-github/v37 v37.0.0
github.com/google/uuid v1.6.0
github.com/goreleaser/goreleaser v1.1.0
Copy link
Member

Choose a reason for hiding this comment

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

I assume those changes are from go mod tidy? If so those should be fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

that's right

mna
mna previously approved these changes Nov 13, 2024
@lukeheath
Copy link
Member

@sgress454 This has some conflicts now but otherwise looks ready to merge.

@sgress454
Copy link
Contributor Author

This has some conflicts now but otherwise looks ready to merge.

@lukeheath someone needs to approve it as well 😉

@lukeheath lukeheath merged commit 04010ba into main Dec 3, 2024
36 checks passed
@lukeheath lukeheath deleted the 19530-use-goreleaser-v2 branch December 3, 2024 22:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants