ink/act_runner
1
1
Fork 0
mirror of https://gitea.com/gitea/act_runner.git synced 2026-08-07 09:24:22 +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/runner@v3.0.1: 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 <bircni@icloud.com>
Reviewed-on: https://gitea.com/gitea/runner/pulls/1136
Reviewed-by: techknowlogick <9+techknowlogick@noreply.gitea.com>
Reviewed-by: bircni <bircni@icloud.com>
Co-authored-by: silverwind <me@silverwind.io>
Reviewed-on: https://gitea.com/gitea/runner/pulls/1148
Reviewed-by: Zettat123 <39446+zettat123@noreply.gitea.com>
This commit is contained in:
Lunny Xiao
2026-08-06 21:50:21 +00:00
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

2
internal/app/cmd/bug_report.go
View File

@@ -7,7 +7,7 @@ import (
"fmt"
"runtime"
"gitea.com/gitea/runner/v3/internal/pkg/ver"
"gitea.com/gitea/runner/internal/pkg/ver"
"github.com/spf13/cobra"
)

4
internal/app/cmd/cache-server.go
View File

@@ -9,8 +9,8 @@ import (
"os"
"os/signal"
"gitea.com/gitea/runner/v3/act/artifactcache"
"gitea.com/gitea/runner/v3/internal/pkg/config"
"gitea.com/gitea/runner/act/artifactcache"
"gitea.com/gitea/runner/internal/pkg/config"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

2
internal/app/cmd/cmd.go
View File

@@ -7,7 +7,7 @@ import (
"context"
"os"
"gitea.com/gitea/runner/v3/internal/pkg/ver"
"gitea.com/gitea/runner/internal/pkg/ver"
"github.com/spf13/cobra"
)

2
internal/app/cmd/config.go
View File

@@ -10,7 +10,7 @@ import (
"slices"
"strings"
"gitea.com/gitea/runner/v3/internal/pkg/config"
"gitea.com/gitea/runner/internal/pkg/config"
"github.com/spf13/cobra"
)

2
internal/app/cmd/config_test.go
View File

@@ -9,7 +9,7 @@ import (
"path/filepath"
"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/require"

18
internal/app/cmd/daemon.go
View File

@@ -16,15 +16,15 @@ import (
"strings"
"time"
"gitea.com/gitea/runner/v3/internal/app/poll"
"gitea.com/gitea/runner/v3/internal/app/run"
"gitea.com/gitea/runner/v3/internal/pkg/client"
"gitea.com/gitea/runner/v3/internal/pkg/config"
"gitea.com/gitea/runner/v3/internal/pkg/envcheck"
"gitea.com/gitea/runner/v3/internal/pkg/labels"
"gitea.com/gitea/runner/v3/internal/pkg/lock"
"gitea.com/gitea/runner/v3/internal/pkg/metrics"
"gitea.com/gitea/runner/v3/internal/pkg/ver"
"gitea.com/gitea/runner/internal/app/poll"
"gitea.com/gitea/runner/internal/app/run"
"gitea.com/gitea/runner/internal/pkg/client"
"gitea.com/gitea/runner/internal/pkg/config"
"gitea.com/gitea/runner/internal/pkg/envcheck"
"gitea.com/gitea/runner/internal/pkg/labels"
"gitea.com/gitea/runner/internal/pkg/lock"
"gitea.com/gitea/runner/internal/pkg/metrics"
"gitea.com/gitea/runner/internal/pkg/ver"
"connectrpc.com/connect"
"github.com/mattn/go-isatty"

2
internal/app/cmd/daemon_test.go
View File

@@ -6,7 +6,7 @@ package cmd
import (
"testing"
"gitea.com/gitea/runner/v3/internal/pkg/config"
"gitea.com/gitea/runner/internal/pkg/config"
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"

12
internal/app/cmd/exec.go
View File

@@ -17,12 +17,12 @@ import (
"strings"
"time"
"gitea.com/gitea/runner/v3/act/artifactcache"
"gitea.com/gitea/runner/v3/act/artifacts"
"gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/v3/act/model"
"gitea.com/gitea/runner/v3/act/runner"
"gitea.com/gitea/runner/v3/internal/app/run"
"gitea.com/gitea/runner/act/artifactcache"
"gitea.com/gitea/runner/act/artifacts"
"gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/act/model"
"gitea.com/gitea/runner/act/runner"
"gitea.com/gitea/runner/internal/app/run"
"github.com/joho/godotenv"
"github.com/moby/moby/api/types/container"

2
internal/app/cmd/exec_test.go
View File

@@ -12,7 +12,7 @@ import (
"strings"
"testing"
"gitea.com/gitea/runner/v3/act/model"
"gitea.com/gitea/runner/act/model"
"github.com/stretchr/testify/require"
"go.yaml.in/yaml/v4"

12
internal/app/cmd/register.go
View File

@@ -14,12 +14,12 @@ import (
"strings"
"time"
"gitea.com/gitea/runner/v3/internal/app/run"
"gitea.com/gitea/runner/v3/internal/pkg/client"
"gitea.com/gitea/runner/v3/internal/pkg/config"
"gitea.com/gitea/runner/v3/internal/pkg/labels"
"gitea.com/gitea/runner/v3/internal/pkg/lock"
"gitea.com/gitea/runner/v3/internal/pkg/ver"
"gitea.com/gitea/runner/internal/app/run"
"gitea.com/gitea/runner/internal/pkg/client"
"gitea.com/gitea/runner/internal/pkg/config"
"gitea.com/gitea/runner/internal/pkg/labels"
"gitea.com/gitea/runner/internal/pkg/lock"
"gitea.com/gitea/runner/internal/pkg/ver"
"connectrpc.com/connect"
pingv1 "gitea.dev/actions-proto-go/ping/v1"

2
internal/app/cmd/register_test.go
View File

@@ -7,7 +7,7 @@ import (
"os"
"testing"
"gitea.com/gitea/runner/v3/internal/pkg/config"
"gitea.com/gitea/runner/internal/pkg/config"
"github.com/stretchr/testify/require"
"gotest.tools/v3/assert"

6
internal/app/poll/poller.go
View File

@@ -12,9 +12,9 @@ import (
"sync/atomic"
"time"
"gitea.com/gitea/runner/v3/internal/pkg/client"
"gitea.com/gitea/runner/v3/internal/pkg/config"
"gitea.com/gitea/runner/v3/internal/pkg/metrics"
"gitea.com/gitea/runner/internal/pkg/client"
"gitea.com/gitea/runner/internal/pkg/config"
"gitea.com/gitea/runner/internal/pkg/metrics"
"connectrpc.com/connect"
runnerv1 "gitea.dev/actions-proto-go/runner/v1"

4
internal/app/poll/poller_test.go
View File

@@ -11,8 +11,8 @@ import (
"testing"
"time"
"gitea.com/gitea/runner/v3/internal/pkg/client/mocks"
"gitea.com/gitea/runner/v3/internal/pkg/config"
"gitea.com/gitea/runner/internal/pkg/client/mocks"
"gitea.com/gitea/runner/internal/pkg/config"
connect_go "connectrpc.com/connect"
runnerv1 "gitea.dev/actions-proto-go/runner/v1"

2
internal/app/run/disk_test.go
View File

@@ -6,7 +6,7 @@ package run
import (
"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/require"

4
internal/app/run/health_check.go
View File

@@ -14,8 +14,8 @@ import (
"strings"
"time"
"gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/v3/internal/pkg/process"
"gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/internal/pkg/process"
)
func (r *Runner) checkConfiguredHealth(ctx context.Context) (bool, string) {

2
internal/app/run/health_check_test.go
View File

@@ -9,7 +9,7 @@ import (
"testing"
"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/require"

10
internal/app/run/post_task_script.go
View File

@@ -13,11 +13,11 @@ import (
"strings"
"time"
"gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/v3/internal/pkg/config"
"gitea.com/gitea/runner/v3/internal/pkg/metrics"
"gitea.com/gitea/runner/v3/internal/pkg/process"
"gitea.com/gitea/runner/v3/internal/pkg/report"
"gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/internal/pkg/config"
"gitea.com/gitea/runner/internal/pkg/metrics"
"gitea.com/gitea/runner/internal/pkg/process"
"gitea.com/gitea/runner/internal/pkg/report"
runnerv1 "gitea.dev/actions-proto-go/runner/v1"
log "github.com/sirupsen/logrus"

6
internal/app/run/post_task_script_test.go
View File

@@ -10,9 +10,9 @@ import (
"testing"
"time"
"gitea.com/gitea/runner/v3/internal/pkg/config"
"gitea.com/gitea/runner/v3/internal/pkg/metrics"
"gitea.com/gitea/runner/v3/internal/pkg/report"
"gitea.com/gitea/runner/internal/pkg/config"
"gitea.com/gitea/runner/internal/pkg/metrics"
"gitea.com/gitea/runner/internal/pkg/report"
runnerv1 "gitea.dev/actions-proto-go/runner/v1"
log "github.com/sirupsen/logrus"

2
internal/app/run/proxy.go
View File

@@ -10,7 +10,7 @@ import (
"slices"
"strings"
"gitea.com/gitea/runner/v3/act/container"
"gitea.com/gitea/runner/act/container"
log "github.com/sirupsen/logrus"
"golang.org/x/net/http/httpproxy"

22
internal/app/run/runner.go
View File

@@ -21,17 +21,17 @@ import (
"sync/atomic"
"time"
"gitea.com/gitea/runner/v3/act/artifactcache"
"gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/v3/act/container"
"gitea.com/gitea/runner/v3/act/model"
"gitea.com/gitea/runner/v3/act/runner"
"gitea.com/gitea/runner/v3/internal/pkg/client"
"gitea.com/gitea/runner/v3/internal/pkg/config"
"gitea.com/gitea/runner/v3/internal/pkg/labels"
"gitea.com/gitea/runner/v3/internal/pkg/metrics"
"gitea.com/gitea/runner/v3/internal/pkg/report"
"gitea.com/gitea/runner/v3/internal/pkg/ver"
"gitea.com/gitea/runner/act/artifactcache"
"gitea.com/gitea/runner/act/common"
"gitea.com/gitea/runner/act/container"
"gitea.com/gitea/runner/act/model"
"gitea.com/gitea/runner/act/runner"
"gitea.com/gitea/runner/internal/pkg/client"
"gitea.com/gitea/runner/internal/pkg/config"
"gitea.com/gitea/runner/internal/pkg/labels"
"gitea.com/gitea/runner/internal/pkg/metrics"
"gitea.com/gitea/runner/internal/pkg/report"
"gitea.com/gitea/runner/internal/pkg/ver"
"connectrpc.com/connect"
runnerv1 "gitea.dev/actions-proto-go/runner/v1"

4
internal/app/run/runner_cache_test.go
View File

@@ -14,8 +14,8 @@ import (
"strings"
"testing"
"gitea.com/gitea/runner/v3/act/artifactcache"
"gitea.com/gitea/runner/v3/internal/pkg/config"
"gitea.com/gitea/runner/act/artifactcache"
"gitea.com/gitea/runner/internal/pkg/config"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

2
internal/app/run/runner_idle_cleanup_test.go
View File

@@ -11,7 +11,7 @@ import (
"testing"
"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/require"

8
internal/app/run/runner_test.go
View File

@@ -9,10 +9,10 @@ import (
"strings"
"testing"
"gitea.com/gitea/runner/v3/act/runner"
clientmocks "gitea.com/gitea/runner/v3/internal/pkg/client/mocks"
"gitea.com/gitea/runner/v3/internal/pkg/config"
"gitea.com/gitea/runner/v3/internal/pkg/ver"
"gitea.com/gitea/runner/act/runner"
clientmocks "gitea.com/gitea/runner/internal/pkg/client/mocks"
"gitea.com/gitea/runner/internal/pkg/config"
"gitea.com/gitea/runner/internal/pkg/ver"
"connectrpc.com/connect"
runnerv1 "gitea.dev/actions-proto-go/runner/v1"

4
internal/app/run/setup.go
View File

@@ -10,8 +10,8 @@ import (
"strconv"
"strings"
"gitea.com/gitea/runner/v3/internal/pkg/report"
"gitea.com/gitea/runner/v3/internal/pkg/ver"
"gitea.com/gitea/runner/internal/pkg/report"
"gitea.com/gitea/runner/internal/pkg/ver"
runnerv1 "gitea.dev/actions-proto-go/runner/v1"
)

4
internal/app/run/setup_test.go
View File

@@ -10,8 +10,8 @@ import (
"runtime"
"testing"
"gitea.com/gitea/runner/v3/internal/pkg/labels"
"gitea.com/gitea/runner/v3/internal/pkg/ver"
"gitea.com/gitea/runner/internal/pkg/labels"
"gitea.com/gitea/runner/internal/pkg/ver"
runnerv1 "gitea.dev/actions-proto-go/runner/v1"
"github.com/stretchr/testify/assert"

2
internal/app/run/workflow.go
View File

@@ -9,7 +9,7 @@ import (
"sort"
"strings"
"gitea.com/gitea/runner/v3/act/model"
"gitea.com/gitea/runner/act/model"
runnerv1 "gitea.dev/actions-proto-go/runner/v1"
"go.yaml.in/yaml/v4"

2
internal/app/run/workflow_test.go
View File

@@ -6,7 +6,7 @@ package run
import (
"testing"
"gitea.com/gitea/runner/v3/act/model"
"gitea.com/gitea/runner/act/model"
runnerv1 "gitea.dev/actions-proto-go/runner/v1"
"github.com/stretchr/testify/require"

2
internal/pkg/client/http.go
View File

@@ -10,7 +10,7 @@ import (
"strings"
"time"
"gitea.com/gitea/runner/v3/internal/pkg/ver"
"gitea.com/gitea/runner/internal/pkg/ver"
"connectrpc.com/connect"
"gitea.dev/actions-proto-go/ping/v1/pingv1connect"

8
internal/pkg/report/reporter.go
View File

@@ -13,10 +13,10 @@ import (
"sync/atomic"
"time"
"gitea.com/gitea/runner/v3/act/runner"
"gitea.com/gitea/runner/v3/internal/pkg/client"
"gitea.com/gitea/runner/v3/internal/pkg/config"
"gitea.com/gitea/runner/v3/internal/pkg/metrics"
"gitea.com/gitea/runner/act/runner"
"gitea.com/gitea/runner/internal/pkg/client"
"gitea.com/gitea/runner/internal/pkg/config"
"gitea.com/gitea/runner/internal/pkg/metrics"
"connectrpc.com/connect"
runnerv1 "gitea.dev/actions-proto-go/runner/v1"

6
internal/pkg/report/reporter_test.go
View File

@@ -16,9 +16,9 @@ import (
"testing"
"time"
"gitea.com/gitea/runner/v3/act/runner"
"gitea.com/gitea/runner/v3/internal/pkg/client/mocks"
"gitea.com/gitea/runner/v3/internal/pkg/config"
"gitea.com/gitea/runner/act/runner"
"gitea.com/gitea/runner/internal/pkg/client/mocks"
"gitea.com/gitea/runner/internal/pkg/config"
connect_go "connectrpc.com/connect"
runnerv1 "gitea.dev/actions-proto-go/runner/v1"

14
internal/pkg/ver/version.go
View File

@@ -3,17 +3,9 @@
package ver
import "runtime/debug"
// version is a fallback for builds without a VCS stamp, such as from a source tarball
var version string
// go build -ldflags "-X gitea.com/gitea/runner/internal/pkg/ver.version=1.2.3"
var version = "dev"
func Version() string {
if version != "" {
return version
}
if info, ok := debug.ReadBuildInfo(); ok && info.Main.Version != "" && info.Main.Version != "(devel)" {
return info.Main.Version
}
return "dev"
return version
}

7
internal/pkg/ver/version_test.go
View File

@@ -6,12 +6,7 @@ package ver
import "testing"
func TestVersion(t *testing.T) {
if got := Version(); got == "" || got == "(devel)" {
t.Errorf("Version() = %q, want a concrete version", got)
}
version = "1.2.3"
defer func() { version = "" }()
// version defaults to "dev" and is overridden at build time via -ldflags
if got := Version(); got != version {
t.Errorf("Version() = %q, want %q", got, version)
}