Skip to content

Commit

Permalink
Merge branch 'main' into vcolombo/sdk-improvement-2
Browse files Browse the repository at this point in the history
  • Loading branch information
victorcolombo authored Oct 13, 2023
2 parents f65de0d + e1317aa commit 26e408e
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 23 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/conventional-pr-title-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ on:
- reopened
- edited
- synchronize
push:
branches:
- gh-readonly-queue/main/**
merge_group:

# cancel redundant builds
concurrency:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/do-not-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Do Not Merge
on:
pull_request:
types: [synchronize, opened, reopened, labeled, unlabeled]
merge_group:

jobs:
do-not-merge:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/gofmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ concurrency:
cancel-in-progress: true

on:
push:
branches:
- gh-readonly-queue/main/**
pull_request:
merge_group:

jobs:
gofmt:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ permissions:
contents: read

on:
push:
branches:
- gh-readonly-queue/main/**
pull_request:
merge_group:

env:
GOLINT_VERSION: v1.53.3
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/push-docs.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: Deploy documentation

on: push
on:
push:
merge_group:

jobs:
publish:
Expand Down
13 changes: 0 additions & 13 deletions cli/cli/commands/clean/clean.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,21 +89,8 @@ func run(
},
}

executeOnlyIfAllFlagIsEnabled := map[string]bool{
oldEngineCleaningPhaseTitle: false,
enclavesCleaningPhaseTitle: false,
unusedImagesPhaseTitle: true,
}

phasesWithErrors := []string{}
for phaseTitle, cleaningFunc := range cleaningPhaseFunctions {
onlyIfAllFlag, found := executeOnlyIfAllFlagIsEnabled[phaseTitle]
if !found {
return stacktrace.NewError("Couldn't find phase %s in executeOnlyIfAllFlagIsEnabled. This is a bug in Kurtosis", phaseTitle)
}
if onlyIfAllFlag && !shouldCleanAll {
continue
}
logrus.Infof("Cleaning %v...", phaseTitle)
successfullyRemovedArtifactUuids, removalErrors, err := cleaningFunc()
if err != nil {
Expand Down

0 comments on commit 26e408e

Please sign in to comment.