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

ci(deps): fix deduplication commit for yarn.lock for Dependabot PRs #12882

Merged
merged 1 commit into from
Apr 4, 2024

Conversation

agilgur5
Copy link
Contributor

@agilgur5 agilgur5 commented Apr 4, 2024

Fixes #12880 (comment), #12234 (comment)

Motivation

  • previously the deduplication commit would fail if there were no changes, so add --allow-empty to the commit as a quick fix

Modifications

Verification

Tested this locally and it worked and exited cleanly (exit code 0):

git add ui/yarn.lock
git commit -s --allow-empty -m 'chore: deduplicate yarn.lock'

Future Work

  1. Optimize this by adding a conditional to not even try to commit if there are no changes to the yarn.lock

- previously it would fail if there were no changes so add `--allow-empty` to the commit as a quick fix

- also add `name`s to these steps for clarity

Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
@agilgur5 agilgur5 added area/build Build or GithubAction/CI issues prioritized-review For members of the Sustainability Effort labels Apr 4, 2024
@terrytangyuan terrytangyuan merged commit 7e4a0db into argoproj:main Apr 4, 2024
28 checks passed
@agilgur5 agilgur5 deleted the ci-fix-auto-deduplicate branch April 4, 2024 15:02
@agilgur5 agilgur5 changed the title ci(deps): fix auto deduplication of yarn.lock for Dependabot PRs ci(deps): fix deduplication commit for yarn.lock for Dependabot PRs Apr 4, 2024
@argoproj argoproj locked as resolved and limited conversation to collaborators Sep 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area/build Build or GithubAction/CI issues prioritized-review For members of the Sustainability Effort
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants