gitea/act
1
0
Fork 0
mirror of https://gitea.com/gitea/act synced 2026-05-06 01:37:48 +02:00
Code Activity

Use go.yaml.in/yaml/v4

Browse Source
This commit is contained in:
Christopher Homberger
2025-10-27 21:46:21 +01:00
parent 7c6118ea2e
commit 0dbc9e6496
18 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/jobparser/evaluator.go
View File

@@ -6,7 +6,7 @@ import (
"strings"
"github.com/nektos/act/pkg/exprparser"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
)
// ExpressionEvaluator is copied from runner.expressionEvaluator,

2
pkg/jobparser/interpeter.go
View File

@@ -3,7 +3,7 @@ package jobparser
import (
"github.com/nektos/act/pkg/exprparser"
"github.com/nektos/act/pkg/model"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
)
// NewInterpeter returns an interpeter used in the server,

2
pkg/jobparser/jobparser.go
View File

@@ -6,7 +6,7 @@ import (
"sort"
"strings"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
"github.com/nektos/act/pkg/exprparser"
"github.com/nektos/act/pkg/model"

2
pkg/jobparser/jobparser_test.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
)
func TestParse(t *testing.T) {

15
pkg/jobparser/model.go
View File

@@ -5,7 +5,7 @@ import (
"fmt"
"github.com/nektos/act/pkg/model"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
)
// SingleWorkflow is a workflow with single job and single matrix
@@ -50,18 +50,17 @@ func (w *SingleWorkflow) SetJob(id string, job *Job) error {
m := map[string]*Job{
id: job,
}
var buf bytes.Buffer
encoder := yaml.NewEncoder(&buf)
encoder.SetIndent(2)
encoder.Encode(m)
encoder.Close()
buf, err := yaml.Marshal(m)
if err != nil {
return err
}
node := yaml.Node{}
if err := yaml.Unmarshal(buf.Bytes(), &node); err != nil {
if err := yaml.Unmarshal(buf, &node); err != nil {
return err
}
if len(node.Content) != 1 || node.Content[0].Kind != yaml.MappingNode {
return fmt.Errorf("can not set job: %s", buf.String())
return fmt.Errorf("can not set job: %s", string(buf))
}
w.RawJobs = *node.Content[0]
return nil

2
pkg/jobparser/model_test.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
)
func TestParseRawOn(t *testing.T) {

2
pkg/model/action.go
View File

@@ -5,7 +5,7 @@ import (
"io"
"strings"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
)
// ActionRunsUsing is the type of runner for the action

2
pkg/model/workflow.go
View File

@@ -10,7 +10,7 @@ import (
"strings"
log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
"github.com/nektos/act/pkg/common"
)

2
pkg/runner/expression.go
View File

@@ -16,7 +16,7 @@ import (
"github.com/nektos/act/pkg/container"
"github.com/nektos/act/pkg/exprparser"
"github.com/nektos/act/pkg/model"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
)
// ExpressionEvaluator is the interface for evaluating expressions

2
pkg/runner/expression_test.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/nektos/act/pkg/exprparser"
"github.com/nektos/act/pkg/model"
assert "github.com/stretchr/testify/assert"
yaml "gopkg.in/yaml.v3"
yaml "go.yaml.in/yaml/v4"
)
func createRunContext(t *testing.T) *RunContext {

2
pkg/runner/run_context_test.go
View File

@@ -15,7 +15,7 @@ import (
log "github.com/sirupsen/logrus"
assert "github.com/stretchr/testify/assert"
yaml "gopkg.in/yaml.v3"
yaml "go.yaml.in/yaml/v4"
)
func TestRunContext_EvalBool(t *testing.T) {

2
pkg/runner/runner_test.go
View File

@@ -15,7 +15,7 @@ import (
"github.com/joho/godotenv"
log "github.com/sirupsen/logrus"
assert "github.com/stretchr/testify/assert"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/model"

2
pkg/runner/step_action_local_test.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/nektos/act/pkg/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
)
type stepActionLocalMocks struct {

2
pkg/runner/step_action_remote_test.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/common/git"

2
pkg/runner/step_test.go
View File

@@ -9,7 +9,7 @@ import (
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
yaml "gopkg.in/yaml.v3"
yaml "go.yaml.in/yaml/v4"
)
func TestMergeIntoMap(t *testing.T) {