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

fix(action): cosmetic fixes to edk2 #68

Merged
merged 1 commit into from
Sep 18, 2023
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
4 changes: 1 addition & 3 deletions action/recipes/edk2.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,13 @@ func edk2(ctx context.Context, client *dagger.Client, common *commonOpts, docker
return err
}

// There is no copying of config file at "defconfig_path"
// content of the config file at "defconfig_path" should be read into string instead

// Setup environment variables in the container
for key, value := range envVars {
myContainer = myContainer.WithEnvVariable(key, value)
}

// Assemble build arguments
// and read content of the config file at "defconfig_path"
buildArgs := fmt.Sprintf("-a %s -p %s -b %s", common.arch, opts.platform, opts.releaseType)
defconfigFileArgs, err := os.ReadFile(common.defconfigPath)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion action/recipes/edk2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func TestEdk2(t *testing.T) {
assert.NoError(t, err)
defer os.Chdir(pwd) // nolint:errcheck

// Clone coreboot repo
// Clone edk2 repo
cmd := exec.Command("git", "clone", "--recurse-submodules", "--branch", tc.edk2Version, "--depth", "1", "https://github.com/tianocore/edk2.git", "Edk2")
err = cmd.Run()
assert.NoError(t, err)
Expand Down