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 v0.103.x branch #10433

Merged
merged 2 commits into from
Jun 18, 2024
Merged

Merge main into v0.103.x branch #10433

merged 2 commits into from
Jun 18, 2024

Conversation

djaglowski
Copy link
Member

No description provided.

#10384
updated `goreleaser` to a new major version and this appears to have
[broken the
config](https://github.com/open-telemetry/opentelemetry-collector/actions/runs/9565775767/job/26369463094).
This problem only became apparent during the release process since the
config is not used otherwise.

This PR adds a github action to run `goreleaser check` on all PRs, since
changes to the config may not be caught until release is attempted.

I've also included what may be the only necessary change to the config,
by [renaming `changelog.skip` to
`changelog.disable`](goreleaser/goreleaser@29f30b6).
This passes `goreleaser check` when run locally.

The `monorepo` section of the config fails locally, but the feature
appears to require the Pro version so I'm unclear if it will pass with
the OSS version.
This PR changes the trigger for releasing the builder to match the
builder module tag. This allows us to release the builder separately by
pushing a dedicated tag.
@github-advanced-security
Copy link

This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation.

@@ -0,0 +1,29 @@
name: Check GoReleaser Config

Check failure

Code scanning / Scorecard

Token-Permissions High

score is 0: no topLevel permission defined
Remediation tip: Visit https://app.stepsecurity.io/secureworkflow.
Tick the 'Restrict permissions for GITHUB_TOKEN'
Untick other options
NOTE: If you want to resolve multiple issues at once, you can visit https://app.stepsecurity.io/securerepo instead.
Click Remediation section below for further remediation help
Copy link
Contributor

@codeboten codeboten Jun 18, 2024

Choose a reason for hiding this comment

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

we can ignore this alert for now, as we have other workflows that will need to be updated as well

Copy link
Member

Choose a reason for hiding this comment

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

Agreed, the comment on #10433 (comment) also makes it seem like CodeQL is a bit confused

@djaglowski djaglowski marked this pull request as ready for review June 18, 2024 15:54
@djaglowski djaglowski requested review from a team and songy23 and removed request for a team June 18, 2024 15:54
@@ -0,0 +1,29 @@
name: Check GoReleaser Config
Copy link
Member

Choose a reason for hiding this comment

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

Agreed, the comment on #10433 (comment) also makes it seem like CodeQL is a bit confused

@codeboten codeboten merged commit 99623d7 into release/v0.103.x Jun 18, 2024
74 of 75 checks passed
@github-actions github-actions bot added this to the next release milestone Jun 18, 2024
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