oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-09-15 18:57:01 +00:00
Code Wiki Activity

GitHub env file support (#426)

Browse source 
* Upgrade to the official golangci-lint action and fix some issues it found

* Update deps

* Remove a shadow warning

* Initialize the splitPattern only once

* Initial attempt at supporting $GITHUB_ENV

Needs some polishing and tests

* Now it's actually working

* Replace golang.org/x/crypto/ssh/terminal with golang.org/x/term

* Disable the issue-228 test again

* The linter is picky

* Discovered that the workflow/envs.txt had to exist in certain cases

* Fix small linter issue
This commit is contained in:
Torbjørn Vatn 2021-01-12 07:39:43 +01:00 • committed by GitHub
parent 0fe34092d1
commit b60851b818
13 changed files with 125 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cmd/root.go
View file

@ -11,7 +11,7 @@ import (
"github.com/nektos/act/pkg/common"
fswatch "github.com/andreaskoch/go-fswatch"
"github.com/andreaskoch/go-fswatch"
"github.com/joho/godotenv"
"github.com/nektos/act/pkg/model"
"github.com/nektos/act/pkg/runner"
@ -79,7 +79,12 @@ func readArgsFile(file string) []string {
if err != nil {
return args
}
defer f.Close()
defer func() {
err := f.Close()
if err != nil {
log.Errorf("Failed to close args file: %v", err)
}
}()
scanner := bufio.NewScanner(f)
for scanner.Scan() {
arg := scanner.Text()
@ -91,7 +96,7 @@ func readArgsFile(file string) []string {
}
func setupLogging(cmd *cobra.Command, args []string) {
func setupLogging(cmd *cobra.Command, _ []string) {
verbose, _ := cmd.Flags().GetBool("verbose")
if verbose {
log.SetLevel(log.DebugLevel)
@ -189,7 +194,7 @@ func newRunCommand(ctx context.Context, input *Input) func(*cobra.Command, []str
Platforms: input.newPlatforms(),
Privileged: input.privileged,
}
runner, err := runner.New(config)
r, err := runner.New(config)
if err != nil {
return err
}
@ -198,10 +203,10 @@ func newRunCommand(ctx context.Context, input *Input) func(*cobra.Command, []str
if watch, err := cmd.Flags().GetBool("watch"); err != nil {
return err
} else if watch {
return watchAndRun(ctx, runner.NewPlanExecutor(plan))
return watchAndRun(ctx, r.NewPlanExecutor(plan))
}
return runner.NewPlanExecutor(plan)(ctx)
return r.NewPlanExecutor(plan)(ctx)
}
}