Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/aw/actions-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@
"version": "v5.6.0",
"sha": "40f1582b2485089dde7abd97c1529aa768e1baff"
},
"actions/setup-go@v6": {
"repo": "actions/setup-go",
"version": "v6",
"sha": "4b73464bb391d4059bd26b0524d20df3927bd417"
},
"actions/setup-go@v6.2.0": {
"repo": "actions/setup-go",
"version": "v6.2.0",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-coach.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/go-logger.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/hourly-ci-cleaner.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/tidy.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions pkg/cli/update_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,9 @@ func TestUpdateCommand_NoMergeFlag(t *testing.T) {
output, err := cmd.CombinedOutput()
outputStr := string(output)

// It should fail because there are no workflows with source, not because --no-merge is unknown
assert.Error(t, err, "Should fail (no source workflows), output: %s", outputStr)
// The --no-merge flag should be recognized (not "unknown flag").
// When no source workflows exist, the command succeeds with an info message.
assert.NoError(t, err, "Should succeed (no source workflows = info message, not error), output: %s", outputStr)
assert.NotContains(t, outputStr, "unknown flag", "The --no-merge flag should be recognized")
assert.Contains(t, outputStr, "no workflows found", "Should report no workflows found")
}
Expand Down
5 changes: 5 additions & 0 deletions pkg/workflow/data/action_pins.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@
"version": "v5.6.0",
"sha": "40f1582b2485089dde7abd97c1529aa768e1baff"
},
"actions/setup-go@v6": {
"repo": "actions/setup-go",
"version": "v6",
"sha": "4b73464bb391d4059bd26b0524d20df3927bd417"
},
"actions/setup-go@v6.2.0": {
"repo": "actions/setup-go",
"version": "v6.2.0",
Expand Down
Loading