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.

Sign up for GitHub

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

chore(cmd): remove interactivity via SSH #522

Merged
merged 2 commits into from
Jan 27, 2025
Merged

chore(cmd): remove interactivity via SSH #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b55ce04
chore(cmd): remove interactivity via SSH
AtomicFS Jan 24, 2025
f1960ae
docs: update notes on interactive debugging
AtomicFS Jan 24, 2025
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
190 changes: 0 additions & 190 deletions cmd/firmware-action/container/ssh.go
View file
Open in desktop

This file was deleted.

151 changes: 0 additions & 151 deletions cmd/firmware-action/container/ssh_test.go
View file
Open in desktop

This file was deleted.

9 changes: 3 additions & 6 deletions cmd/firmware-action/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,9 @@ var CLI struct {
Config string `type:"path" required:"" default:"${config_file}" help:"Path to configuration file"`

Build struct {
Target string `required:"" help:"Select which target to build, use ID from configuration file"`
Recursive bool `help:"Build recursively with all dependencies and payloads"`
Interactive bool `help:"Open interactive SSH into container if build fails"`
} `cmd:"build" help:"Build a target defined in configuration file"`
Target string `required:"" help:"Select which target to build, use ID from configuration file"`
Recursive bool `help:"Build recursively with all dependencies and payloads"`
} `cmd:"build" help:"Build a target defined in configuration file. For interactive debugging preface the command with 'dagger run --interactive', for example 'dagger run --interactive $(which firmware-action) build --config=...'. To install dagger follow instructions at https://dagger.io/"`

GenerateConfig struct{} `cmd:"generate-config" help:"Generate empty configuration file"`
Version struct{} `cmd:"version" help:"Print version and exit"`
Expand Down Expand Up @@ -80,7 +79,6 @@ func run(ctx context.Context) error {
slog.String("input/config", CLI.Config),
slog.String("input/target", CLI.Build.Target),
slog.Bool("input/recursive", CLI.Build.Recursive),
slog.Bool("input/interactive", CLI.Build.Interactive),
)

// Check if submodules were initialized
Expand Down Expand Up @@ -129,7 +127,6 @@ submodule_out:
ctx,
CLI.Build.Target,
CLI.Build.Recursive,
CLI.Build.Interactive,
myConfig,
recipes.Execute,
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/firmware-action/recipes/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ type FirmwareModule interface {
GetContainerOutputFiles() []string
GetOutputDir() string
GetSources() []string
buildFirmware(ctx context.Context, client *dagger.Client, dockerfileDirectoryPath string) (*dagger.Container, error)
buildFirmware(ctx context.Context, client *dagger.Client, dockerfileDirectoryPath string) error
}

// ===========
Expand Down
Loading
Loading