ink/act_runner
1
1
Fork 0
mirror of https://gitea.com/gitea/act_runner.git synced 2026-08-08 09:55:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: revert 4c2ab943a8 (#1148)

Browse Source 
Revert #1136 and use actionslib instead.

revert chore: bump the module path to `/v3`, take the version from the VCS stamp (#1136)

gitea can not consume the runner's api by version while it's version mismatches the module version:

```
go: gitea.com/gitea/[email protected]: invalid version: module contains a go.mod file,
so module path must match major version ("gitea.com/gitea/runner/v3")
```

Fix that by bumping the module version now. The existing `v3.0.0` and `v3.0.1` tags stay unusable, so a new tag is needed after this lands.

Also drop the version `-X` linker flags, which would otherwise have to repeat the new path in both `Makefile` and `.goreleaser.yaml`, where a stale path makes injection silently no-op. Go has recorded the module version in the build info since 1.24, so `Version()` reads it from there, keeping the variable as an override for builds without a VCS stamp.

That part started as https://gitea.com/gitea/runner/pulls/1137 but belongs here: the stamp resolves against the tags that are legal for the module path, so without the `/v3` bump it would report `v1.0.9-0.<ts>-<sha>`. Since `release-nightly.yml` triggers on every push to `main`, splitting them would publish a nightly with a `v1` version.

---------

Co-authored-by: bircni <[email protected]>
Reviewed-on: https://gitea.com/gitea/runner/pulls/1136
Reviewed-by: techknowlogick <[email protected]>
Reviewed-by: bircni <[email protected]>
Co-authored-by: silverwind <[email protected]>
Reviewed-on: https://gitea.com/gitea/runner/pulls/1148
Reviewed-by: Zettat123 <[email protected]>
This commit is contained in:
Lunny Xiao
2026-08-06 21:50:21 +00:00
co-authored by bircni silverwind
parent 4c2ab943a8
commit 24c13a1fd0
99 changed files with 223 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.goreleaser.yaml
+1 -1
View File
@@ -65,7 +65,7 @@ builds:
flags: flags:
- -trimpath - -trimpath
ldflags: ldflags:
- -s -w - -s -w -X gitea.com/gitea/runner/internal/pkg/ver.version={{ .Summary }}
binary: >- binary: >-
{{ .ProjectName }}- {{ .ProjectName }}-
{{- .Version }}- {{- .Version }}-
Makefile
+11 -1
View File
@@ -51,18 +51,28 @@ else
GO_ENV_WINDOWS := GOOS=windows GO_ENV_WINDOWS := GOOS=windows
endif endif
STORED_VERSION_FILE := VERSION
ifneq ($(DRONE_TAG),) ifneq ($(DRONE_TAG),)
VERSION ?= $(subst v,,$(DRONE_TAG)) VERSION ?= $(subst v,,$(DRONE_TAG))
RELASE_VERSION ?= $(VERSION)
else else
ifneq ($(DRONE_BRANCH),) ifneq ($(DRONE_BRANCH),)
VERSION ?= $(subst release/v,,$(DRONE_BRANCH)) VERSION ?= $(subst release/v,,$(DRONE_BRANCH))
else else
VERSION ?= main VERSION ?= main
endif endif
STORED_VERSION=$(shell cat $(STORED_VERSION_FILE) 2>/dev/null)
ifneq ($(STORED_VERSION),)
RELASE_VERSION ?= $(STORED_VERSION)
else
RELASE_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
endif
endif endif
TAGS ?= TAGS ?=
LDFLAGS ?= LDFLAGS ?= -X "gitea.com/gitea/runner/internal/pkg/ver.version=v$(RELASE_VERSION)"
.PHONY: all .PHONY: all
all: build all: build
act/artifactcache/handler.go
+1 -1
View File
@@ -26,7 +26,7 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"github.com/julienschmidt/httprouter" "github.com/julienschmidt/httprouter"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
act/artifacts/server.go
+1 -1
View File
@@ -17,7 +17,7 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"github.com/julienschmidt/httprouter" "github.com/julienschmidt/httprouter"
) )
act/common/git/git.go
+2 -2
View File
@@ -15,8 +15,8 @@ import (
"strings" "strings"
"sync" "sync"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/internal/pkg/lock" "gitea.com/gitea/runner/internal/pkg/lock"
"github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/config" "github.com/go-git/go-git/v5/config"
act/common/git/git_test.go
+1 -1
View File
@@ -16,7 +16,7 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
logrustest "github.com/sirupsen/logrus/hooks/test" logrustest "github.com/sirupsen/logrus/hooks/test"
act/container/container_types.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"fmt" "fmt"
"io" "io"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
"github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/container"
act/container/docker_auth.go
+1 -1
View File
@@ -9,7 +9,7 @@ package container
import ( import (
"context" "context"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/cli/cli/config" "github.com/docker/cli/cli/config"
act/container/docker_build.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"github.com/moby/go-archive" "github.com/moby/go-archive"
"github.com/moby/go-archive/compression" "github.com/moby/go-archive/compression"
act/container/docker_network.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"github.com/moby/moby/client" "github.com/moby/moby/client"
) )
act/container/docker_pull.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/moby/moby/api/pkg/authconfig" "github.com/moby/moby/api/pkg/authconfig"
act/container/docker_run.go
+2 -2
View File
@@ -23,8 +23,8 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/filecollector" "gitea.com/gitea/runner/act/filecollector"
"dario.cat/mergo" "dario.cat/mergo"
cerrdefs "github.com/containerd/errdefs" cerrdefs "github.com/containerd/errdefs"
act/container/docker_run_test.go
+1 -1
View File
@@ -19,7 +19,7 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
cerrdefs "github.com/containerd/errdefs" cerrdefs "github.com/containerd/errdefs"
"github.com/moby/moby/api/pkg/stdcopy" "github.com/moby/moby/api/pkg/stdcopy"
act/container/docker_stub.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"runtime" "runtime"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"github.com/moby/moby/api/types/system" "github.com/moby/moby/api/types/system"
) )
act/container/docker_volume.go
+1 -1
View File
@@ -9,7 +9,7 @@ package container
import ( import (
"context" "context"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"github.com/moby/moby/client" "github.com/moby/moby/client"
) )
act/container/host_environment.go
+4 -4
View File
@@ -21,10 +21,10 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/filecollector" "gitea.com/gitea/runner/act/filecollector"
"gitea.com/gitea/runner/v3/act/lookpath" "gitea.com/gitea/runner/act/lookpath"
"gitea.com/gitea/runner/v3/internal/pkg/process" "gitea.com/gitea/runner/internal/pkg/process"
"github.com/go-git/go-billy/v5/helper/polyfill" "github.com/go-git/go-billy/v5/helper/polyfill"
"github.com/go-git/go-billy/v5/osfs" "github.com/go-git/go-billy/v5/osfs"
act/container/host_environment_test.go
+1 -1
View File
@@ -17,7 +17,7 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
act/container/parse_env_file.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"io" "io"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"golang.org/x/text/encoding/unicode" "golang.org/x/text/encoding/unicode"
"golang.org/x/text/transform" "golang.org/x/text/transform"
act/exprparser/functions.go
+1 -1
View File
@@ -18,7 +18,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/go-git/go-git/v5/plumbing/format/gitignore" "github.com/go-git/go-git/v5/plumbing/format/gitignore"
"github.com/rhysd/actionlint" "github.com/rhysd/actionlint"
act/exprparser/functions_test.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
act/exprparser/interpreter.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/rhysd/actionlint" "github.com/rhysd/actionlint"
) )
act/exprparser/interpreter_test.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
act/model/github_context.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/common/git" "gitea.com/gitea/runner/act/common/git"
) )
type GithubContext struct { type GithubContext struct {
act/model/workflow.go
+1 -1
View File
@@ -15,7 +15,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"go.yaml.in/yaml/v4" "go.yaml.in/yaml/v4"
act/runner/action.go
+4 -4
View File
@@ -20,10 +20,10 @@ import (
"runtime" "runtime"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/common/git" "gitea.com/gitea/runner/act/common/git"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/kballard/go-shellquote" "github.com/kballard/go-shellquote"
) )
act/runner/action_cache_test.go
+2 -2
View File
@@ -17,8 +17,8 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
act/runner/action_composite.go
+2 -2
View File
@@ -12,8 +12,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
) )
func evaluateCompositeInputAndEnv(ctx context.Context, parent *RunContext, step actionStep) map[string]string { func evaluateCompositeInputAndEnv(ctx context.Context, parent *RunContext, step actionStep) map[string]string {
act/runner/action_test.go
+4 -4
View File
@@ -13,10 +13,10 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/common/git" "gitea.com/gitea/runner/act/common/git"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
act/runner/cancellation_test.go
+3 -3
View File
@@ -8,9 +8,9 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/exprparser" "gitea.com/gitea/runner/act/exprparser"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
act/runner/command.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"regexp" "regexp"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
) )
var commandPatternGA *regexp.Regexp var commandPatternGA *regexp.Regexp
act/runner/command_test.go
+2 -2
View File
@@ -11,8 +11,8 @@ import (
"os" "os"
"testing" "testing"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/sirupsen/logrus/hooks/test" "github.com/sirupsen/logrus/hooks/test"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
act/runner/container_mock_test.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"context" "context"
"io" "io"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
) )
act/runner/expression.go
+4 -4
View File
@@ -16,10 +16,10 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
"gitea.com/gitea/runner/v3/act/exprparser" "gitea.com/gitea/runner/act/exprparser"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
_ "embed" _ "embed"
act/runner/expression_test.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"strings" "strings"
"testing" "testing"
"gitea.com/gitea/runner/v3/act/exprparser" "gitea.com/gitea/runner/act/exprparser"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
assert "github.com/stretchr/testify/assert" assert "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
act/runner/helpers_test.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"runtime" "runtime"
"testing" "testing"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
mobyclient "github.com/moby/moby/client" mobyclient "github.com/moby/moby/client"
) )
act/runner/job_executor.go
+4 -4
View File
@@ -21,10 +21,10 @@ import (
"time" "time"
"unicode" "unicode"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
"gitea.com/gitea/runner/v3/act/exprparser" "gitea.com/gitea/runner/act/exprparser"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
) )
const maxJobSummaryBytes = 1024 * 1024 const maxJobSummaryBytes = 1024 * 1024
act/runner/job_executor_test.go
+3 -3
View File
@@ -20,9 +20,9 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
logrustest "github.com/sirupsen/logrus/hooks/test" logrustest "github.com/sirupsen/logrus/hooks/test"
act/runner/job_hooks.go
+2 -2
View File
@@ -11,8 +11,8 @@ import (
"path" "path"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
) )
// GitHub's job-hook variables, read as a fallback when the settings are unset. // GitHub's job-hook variables, read as a fallback when the settings are unset.
act/runner/job_hooks_test.go
+2 -2
View File
@@ -11,8 +11,8 @@ import (
"maps" "maps"
"testing" "testing"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/sirupsen/logrus/hooks/test" "github.com/sirupsen/logrus/hooks/test"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
act/runner/local_repository_cache.go
+1 -1
View File
@@ -16,7 +16,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/filecollector" "gitea.com/gitea/runner/act/filecollector"
) )
type LocalRepositoryCache struct { type LocalRepositoryCache struct {
act/runner/logger.go
+1 -1
View File
@@ -17,7 +17,7 @@ import (
"strings" "strings"
"sync" "sync"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/term" "golang.org/x/term"
act/runner/max_parallel_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ package runner
import ( import (
"testing" "testing"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"go.yaml.in/yaml/v4" "go.yaml.in/yaml/v4"
act/runner/reusable_workflow.go
+3 -3
View File
@@ -14,9 +14,9 @@ import (
"regexp" "regexp"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/common/git" "gitea.com/gitea/runner/act/common/git"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
) )
func newLocalReusableWorkflowExecutor(rc *RunContext) common.Executor { func newLocalReusableWorkflowExecutor(rc *RunContext) common.Executor {
act/runner/reusable_workflow_test.go
+2 -2
View File
@@ -13,8 +13,8 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/act/common/git" "gitea.com/gitea/runner/act/common/git"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
act/runner/run_context.go
+5 -5
View File
@@ -25,11 +25,11 @@ import (
"sync" "sync"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
"gitea.com/gitea/runner/v3/act/exprparser" "gitea.com/gitea/runner/act/exprparser"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"gitea.com/gitea/runner/v3/internal/pkg/lock" "gitea.com/gitea/runner/internal/pkg/lock"
"github.com/docker/cli/cli/compose/loader" "github.com/docker/cli/cli/compose/loader"
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
act/runner/run_context_test.go
+4 -4
View File
@@ -15,10 +15,10 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
"gitea.com/gitea/runner/v3/act/exprparser" "gitea.com/gitea/runner/act/exprparser"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/docker/cli/cli/compose/loader" "github.com/docker/cli/cli/compose/loader"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
act/runner/runner.go
+3 -3
View File
@@ -14,9 +14,9 @@ import (
"sync" "sync"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
docker_container "github.com/moby/moby/api/types/container" docker_container "github.com/moby/moby/api/types/container"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
act/runner/runner_test.go
+2 -2
View File
@@ -18,8 +18,8 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/joho/godotenv" "github.com/joho/godotenv"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
act/runner/step.go
+4 -4
View File
@@ -13,10 +13,10 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
"gitea.com/gitea/runner/v3/act/exprparser" "gitea.com/gitea/runner/act/exprparser"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
) )
type step interface { type step interface {
act/runner/step_action_local.go
+2 -2
View File
@@ -15,8 +15,8 @@ import (
"path" "path"
"path/filepath" "path/filepath"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
) )
type stepActionLocal struct { type stepActionLocal struct {
act/runner/step_action_local_test.go
+2 -2
View File
@@ -12,8 +12,8 @@ import (
"strings" "strings"
"testing" "testing"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
act/runner/step_action_remote.go
+3 -3
View File
@@ -16,9 +16,9 @@ import (
"regexp" "regexp"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/common/git" "gitea.com/gitea/runner/act/common/git"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
gogit "github.com/go-git/go-git/v5" gogit "github.com/go-git/go-git/v5"
) )
act/runner/step_action_remote_test.go
+3 -3
View File
@@ -17,9 +17,9 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/common/git" "gitea.com/gitea/runner/act/common/git"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
act/runner/step_docker.go
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"fmt" "fmt"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/kballard/go-shellquote" "github.com/kballard/go-shellquote"
) )
act/runner/step_docker_test.go
+2 -2
View File
@@ -11,8 +11,8 @@ import (
"strings" "strings"
"testing" "testing"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
act/runner/step_factory.go
+1 -1
View File
@@ -7,7 +7,7 @@ package runner
import ( import (
"fmt" "fmt"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
) )
type stepFactory interface { type stepFactory interface {
act/runner/step_factory_test.go
+1 -1
View File
@@ -7,7 +7,7 @@ package runner
import ( import (
"testing" "testing"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
act/runner/step_run.go
+4 -4
View File
@@ -12,10 +12,10 @@ import (
"slices" "slices"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
"gitea.com/gitea/runner/v3/act/lookpath" "gitea.com/gitea/runner/act/lookpath"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/kballard/go-shellquote" "github.com/kballard/go-shellquote"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
act/runner/step_run_print_test.go
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"strings" "strings"
"testing" "testing"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
act/runner/step_run_test.go
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"io" "io"
"testing" "testing"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
act/runner/step_test.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"errors" "errors"
"testing" "testing"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
act/runner/toolkit_patch.go
+3 -3
View File
@@ -11,9 +11,9 @@ import (
"regexp" "regexp"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/common/git" "gitea.com/gitea/runner/act/common/git"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
) )
// Actions bundle the @actions toolkit into their own JavaScript, and two of its lines keep it // Actions bundle the @actions toolkit into their own JavaScript, and two of its lines keep it
act/runner/toolkit_patch_e2e_test.go
+1 -1
View File
@@ -18,7 +18,7 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/act/artifactcache" "gitea.com/gitea/runner/act/artifactcache"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
act/runner/toolkit_patch_test.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"strings" "strings"
"testing" "testing"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
go.mod
+1 -1
View File
@@ -1,4 +1,4 @@
module gitea.com/gitea/runner/v3 module gitea.com/gitea/runner
go 1.26.0 go 1.26.0
internal/app/cmd/bug_report.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"fmt" "fmt"
"runtime" "runtime"
"gitea.com/gitea/runner/v3/internal/pkg/ver" "gitea.com/gitea/runner/internal/pkg/ver"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
internal/app/cmd/cache-server.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"os" "os"
"os/signal" "os/signal"
"gitea.com/gitea/runner/v3/act/artifactcache" "gitea.com/gitea/runner/act/artifactcache"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
internal/app/cmd/cmd.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"context" "context"
"os" "os"
"gitea.com/gitea/runner/v3/internal/pkg/ver" "gitea.com/gitea/runner/internal/pkg/ver"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
internal/app/cmd/config.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"slices" "slices"
"strings" "strings"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
internal/app/cmd/config_test.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
internal/app/cmd/daemon.go
+9 -9
View File
@@ -16,15 +16,15 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/v3/internal/app/poll" "gitea.com/gitea/runner/internal/app/poll"
"gitea.com/gitea/runner/v3/internal/app/run" "gitea.com/gitea/runner/internal/app/run"
"gitea.com/gitea/runner/v3/internal/pkg/client" "gitea.com/gitea/runner/internal/pkg/client"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
"gitea.com/gitea/runner/v3/internal/pkg/envcheck" "gitea.com/gitea/runner/internal/pkg/envcheck"
"gitea.com/gitea/runner/v3/internal/pkg/labels" "gitea.com/gitea/runner/internal/pkg/labels"
"gitea.com/gitea/runner/v3/internal/pkg/lock" "gitea.com/gitea/runner/internal/pkg/lock"
"gitea.com/gitea/runner/v3/internal/pkg/metrics" "gitea.com/gitea/runner/internal/pkg/metrics"
"gitea.com/gitea/runner/v3/internal/pkg/ver" "gitea.com/gitea/runner/internal/pkg/ver"
"connectrpc.com/connect" "connectrpc.com/connect"
"github.com/mattn/go-isatty" "github.com/mattn/go-isatty"
internal/app/cmd/daemon_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ package cmd
import ( import (
"testing" "testing"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
internal/app/cmd/exec.go
+6 -6
View File
@@ -17,12 +17,12 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/v3/act/artifactcache" "gitea.com/gitea/runner/act/artifactcache"
"gitea.com/gitea/runner/v3/act/artifacts" "gitea.com/gitea/runner/act/artifacts"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"gitea.com/gitea/runner/v3/act/runner" "gitea.com/gitea/runner/act/runner"
"gitea.com/gitea/runner/v3/internal/app/run" "gitea.com/gitea/runner/internal/app/run"
"github.com/joho/godotenv" "github.com/joho/godotenv"
"github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/container"
internal/app/cmd/exec_test.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"strings" "strings"
"testing" "testing"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"go.yaml.in/yaml/v4" "go.yaml.in/yaml/v4"
internal/app/cmd/register.go
+6 -6
View File
@@ -14,12 +14,12 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/v3/internal/app/run" "gitea.com/gitea/runner/internal/app/run"
"gitea.com/gitea/runner/v3/internal/pkg/client" "gitea.com/gitea/runner/internal/pkg/client"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
"gitea.com/gitea/runner/v3/internal/pkg/labels" "gitea.com/gitea/runner/internal/pkg/labels"
"gitea.com/gitea/runner/v3/internal/pkg/lock" "gitea.com/gitea/runner/internal/pkg/lock"
"gitea.com/gitea/runner/v3/internal/pkg/ver" "gitea.com/gitea/runner/internal/pkg/ver"
"connectrpc.com/connect" "connectrpc.com/connect"
pingv1 "gitea.dev/actions-proto-go/ping/v1" pingv1 "gitea.dev/actions-proto-go/ping/v1"
internal/app/cmd/register_test.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"os" "os"
"testing" "testing"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
internal/app/poll/poller.go
+3 -3
View File
@@ -12,9 +12,9 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"gitea.com/gitea/runner/v3/internal/pkg/client" "gitea.com/gitea/runner/internal/pkg/client"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
"gitea.com/gitea/runner/v3/internal/pkg/metrics" "gitea.com/gitea/runner/internal/pkg/metrics"
"connectrpc.com/connect" "connectrpc.com/connect"
runnerv1 "gitea.dev/actions-proto-go/runner/v1" runnerv1 "gitea.dev/actions-proto-go/runner/v1"
internal/app/poll/poller_test.go
+2 -2
View File
@@ -11,8 +11,8 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/internal/pkg/client/mocks" "gitea.com/gitea/runner/internal/pkg/client/mocks"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
connect_go "connectrpc.com/connect" connect_go "connectrpc.com/connect"
runnerv1 "gitea.dev/actions-proto-go/runner/v1" runnerv1 "gitea.dev/actions-proto-go/runner/v1"
internal/app/run/disk_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ package run
import ( import (
"testing" "testing"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
internal/app/run/health_check.go
+2 -2
View File
@@ -14,8 +14,8 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/internal/pkg/process" "gitea.com/gitea/runner/internal/pkg/process"
) )
func (r *Runner) checkConfiguredHealth(ctx context.Context) (bool, string) { func (r *Runner) checkConfiguredHealth(ctx context.Context) (bool, string) {
internal/app/run/health_check_test.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
internal/app/run/post_task_script.go
+5 -5
View File
@@ -13,11 +13,11 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
"gitea.com/gitea/runner/v3/internal/pkg/metrics" "gitea.com/gitea/runner/internal/pkg/metrics"
"gitea.com/gitea/runner/v3/internal/pkg/process" "gitea.com/gitea/runner/internal/pkg/process"
"gitea.com/gitea/runner/v3/internal/pkg/report" "gitea.com/gitea/runner/internal/pkg/report"
runnerv1 "gitea.dev/actions-proto-go/runner/v1" runnerv1 "gitea.dev/actions-proto-go/runner/v1"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
internal/app/run/post_task_script_test.go
+3 -3
View File
@@ -10,9 +10,9 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
"gitea.com/gitea/runner/v3/internal/pkg/metrics" "gitea.com/gitea/runner/internal/pkg/metrics"
"gitea.com/gitea/runner/v3/internal/pkg/report" "gitea.com/gitea/runner/internal/pkg/report"
runnerv1 "gitea.dev/actions-proto-go/runner/v1" runnerv1 "gitea.dev/actions-proto-go/runner/v1"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
internal/app/run/proxy.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"slices" "slices"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"golang.org/x/net/http/httpproxy" "golang.org/x/net/http/httpproxy"
internal/app/run/runner.go
+11 -11
View File
@@ -21,17 +21,17 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"gitea.com/gitea/runner/v3/act/artifactcache" "gitea.com/gitea/runner/act/artifactcache"
"gitea.com/gitea/runner/v3/act/common" "gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/v3/act/container" "gitea.com/gitea/runner/act/container"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
"gitea.com/gitea/runner/v3/act/runner" "gitea.com/gitea/runner/act/runner"
"gitea.com/gitea/runner/v3/internal/pkg/client" "gitea.com/gitea/runner/internal/pkg/client"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
"gitea.com/gitea/runner/v3/internal/pkg/labels" "gitea.com/gitea/runner/internal/pkg/labels"
"gitea.com/gitea/runner/v3/internal/pkg/metrics" "gitea.com/gitea/runner/internal/pkg/metrics"
"gitea.com/gitea/runner/v3/internal/pkg/report" "gitea.com/gitea/runner/internal/pkg/report"
"gitea.com/gitea/runner/v3/internal/pkg/ver" "gitea.com/gitea/runner/internal/pkg/ver"
"connectrpc.com/connect" "connectrpc.com/connect"
runnerv1 "gitea.dev/actions-proto-go/runner/v1" runnerv1 "gitea.dev/actions-proto-go/runner/v1"
internal/app/run/runner_cache_test.go
+2 -2
View File
@@ -14,8 +14,8 @@ import (
"strings" "strings"
"testing" "testing"
"gitea.com/gitea/runner/v3/act/artifactcache" "gitea.com/gitea/runner/act/artifactcache"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
internal/app/run/runner_idle_cleanup_test.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
internal/app/run/runner_test.go
+4 -4
View File
@@ -9,10 +9,10 @@ import (
"strings" "strings"
"testing" "testing"
"gitea.com/gitea/runner/v3/act/runner" "gitea.com/gitea/runner/act/runner"
clientmocks "gitea.com/gitea/runner/v3/internal/pkg/client/mocks" clientmocks "gitea.com/gitea/runner/internal/pkg/client/mocks"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
"gitea.com/gitea/runner/v3/internal/pkg/ver" "gitea.com/gitea/runner/internal/pkg/ver"
"connectrpc.com/connect" "connectrpc.com/connect"
runnerv1 "gitea.dev/actions-proto-go/runner/v1" runnerv1 "gitea.dev/actions-proto-go/runner/v1"
internal/app/run/setup.go
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"gitea.com/gitea/runner/v3/internal/pkg/report" "gitea.com/gitea/runner/internal/pkg/report"
"gitea.com/gitea/runner/v3/internal/pkg/ver" "gitea.com/gitea/runner/internal/pkg/ver"
runnerv1 "gitea.dev/actions-proto-go/runner/v1" runnerv1 "gitea.dev/actions-proto-go/runner/v1"
) )
internal/app/run/setup_test.go
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"runtime" "runtime"
"testing" "testing"
"gitea.com/gitea/runner/v3/internal/pkg/labels" "gitea.com/gitea/runner/internal/pkg/labels"
"gitea.com/gitea/runner/v3/internal/pkg/ver" "gitea.com/gitea/runner/internal/pkg/ver"
runnerv1 "gitea.dev/actions-proto-go/runner/v1" runnerv1 "gitea.dev/actions-proto-go/runner/v1"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
internal/app/run/workflow.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"sort" "sort"
"strings" "strings"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
runnerv1 "gitea.dev/actions-proto-go/runner/v1" runnerv1 "gitea.dev/actions-proto-go/runner/v1"
"go.yaml.in/yaml/v4" "go.yaml.in/yaml/v4"
internal/app/run/workflow_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ package run
import ( import (
"testing" "testing"
"gitea.com/gitea/runner/v3/act/model" "gitea.com/gitea/runner/act/model"
runnerv1 "gitea.dev/actions-proto-go/runner/v1" runnerv1 "gitea.dev/actions-proto-go/runner/v1"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
internal/pkg/client/http.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/v3/internal/pkg/ver" "gitea.com/gitea/runner/internal/pkg/ver"
"connectrpc.com/connect" "connectrpc.com/connect"
"gitea.dev/actions-proto-go/ping/v1/pingv1connect" "gitea.dev/actions-proto-go/ping/v1/pingv1connect"
internal/pkg/report/reporter.go
+4 -4
View File
@@ -13,10 +13,10 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"gitea.com/gitea/runner/v3/act/runner" "gitea.com/gitea/runner/act/runner"
"gitea.com/gitea/runner/v3/internal/pkg/client" "gitea.com/gitea/runner/internal/pkg/client"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
"gitea.com/gitea/runner/v3/internal/pkg/metrics" "gitea.com/gitea/runner/internal/pkg/metrics"
"connectrpc.com/connect" "connectrpc.com/connect"
runnerv1 "gitea.dev/actions-proto-go/runner/v1" runnerv1 "gitea.dev/actions-proto-go/runner/v1"
internal/pkg/report/reporter_test.go
+3 -3
View File
@@ -16,9 +16,9 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/v3/act/runner" "gitea.com/gitea/runner/act/runner"
"gitea.com/gitea/runner/v3/internal/pkg/client/mocks" "gitea.com/gitea/runner/internal/pkg/client/mocks"
"gitea.com/gitea/runner/v3/internal/pkg/config" "gitea.com/gitea/runner/internal/pkg/config"
connect_go "connectrpc.com/connect" connect_go "connectrpc.com/connect"
runnerv1 "gitea.dev/actions-proto-go/runner/v1" runnerv1 "gitea.dev/actions-proto-go/runner/v1"
internal/pkg/ver/version.go
+3 -11
View File
@@ -3,17 +3,9 @@
package ver package ver
import "runtime/debug" // go build -ldflags "-X gitea.com/gitea/runner/internal/pkg/ver.version=1.2.3"
var version = "dev"
// version is a fallback for builds without a VCS stamp, such as from a source tarball
var version string
func Version() string { func Version() string {
if version != "" { return version
return version
}
if info, ok := debug.ReadBuildInfo(); ok && info.Main.Version != "" && info.Main.Version != "(devel)" {
return info.Main.Version
}
return "dev"
} }
internal/pkg/ver/version_test.go
+1 -6
View File
@@ -6,12 +6,7 @@ package ver
import "testing" import "testing"
func TestVersion(t *testing.T) { func TestVersion(t *testing.T) {
if got := Version(); got == "" || got == "(devel)" { // version defaults to "dev" and is overridden at build time via -ldflags
t.Errorf("Version() = %q, want a concrete version", got)
}
version = "1.2.3"
defer func() { version = "" }()
if got := Version(); got != version { if got := Version(); got != version {
t.Errorf("Version() = %q, want %q", got, version) t.Errorf("Version() = %q, want %q", got, version)
} }
main.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"os/signal" "os/signal"
"syscall" "syscall"
"gitea.com/gitea/runner/v3/internal/app/cmd" "gitea.com/gitea/runner/internal/app/cmd"
) )
func main() { func main() {
tools/coverage-report.ts
+1 -1
View File
@@ -14,7 +14,7 @@ import {readFileSync, writeFileSync} from 'node:fs';
import {basename, dirname} from 'node:path'; import {basename, dirname} from 'node:path';
import {argv, exit, stderr} from 'node:process'; import {argv, exit, stderr} from 'node:process';
const modulePrefix = 'gitea.com/gitea/runner/v3/'; const modulePrefix = 'gitea.com/gitea/runner/';
type Counter = { type Counter = {
covered: number; covered: number;