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]>
This commit is contained in:
silverwindandbircni authored and silverwind committed 2026-08-06 20:05:42 +00:00
1 parent 20497aaf4f
commit 4c2ab943a8
99 files changed
+226 -223

No files matched your search

+1 -1
View File
@@ -65,7 +65,7 @@ builds:
flags: flags:
- -trimpath - -trimpath
ldflags: ldflags:
- -s -w -X gitea.com/gitea/runner/internal/pkg/ver.version={{ .Summary }} - -s -w
binary: >- binary: >-
{{ .ProjectName }}- {{ .ProjectName }}-
{{- .Version }}- {{- .Version }}-
+1 -11
View File
@@ -51,28 +51,18 @@ 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 ?= -X "gitea.com/gitea/runner/internal/pkg/ver.version=v$(RELASE_VERSION)" LDFLAGS ?=
.PHONY: all .PHONY: all
all: build all: build
+1 -1
View File
@@ -26,7 +26,7 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"github.com/julienschmidt/httprouter" "github.com/julienschmidt/httprouter"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
+1 -1
View File
@@ -17,7 +17,7 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"github.com/julienschmidt/httprouter" "github.com/julienschmidt/httprouter"
) )
+2 -2
View File
@@ -15,8 +15,8 @@ import (
"strings" "strings"
"sync" "sync"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/internal/pkg/lock" "gitea.com/gitea/runner/v3/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"
+1 -1
View File
@@ -16,7 +16,7 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/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"
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"fmt" "fmt"
"io" "io"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/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"
+1 -1
View File
@@ -9,7 +9,7 @@ package container
import ( import (
"context" "context"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/cli/cli/config" "github.com/docker/cli/cli/config"
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"github.com/moby/go-archive" "github.com/moby/go-archive"
"github.com/moby/go-archive/compression" "github.com/moby/go-archive/compression"
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"github.com/moby/moby/client" "github.com/moby/moby/client"
) )
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/moby/moby/api/pkg/authconfig" "github.com/moby/moby/api/pkg/authconfig"
+2 -2
View File
@@ -23,8 +23,8 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/filecollector" "gitea.com/gitea/runner/v3/act/filecollector"
"dario.cat/mergo" "dario.cat/mergo"
cerrdefs "github.com/containerd/errdefs" cerrdefs "github.com/containerd/errdefs"
+1 -1
View File
@@ -19,7 +19,7 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/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"
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"runtime" "runtime"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"github.com/moby/moby/api/types/system" "github.com/moby/moby/api/types/system"
) )
+1 -1
View File
@@ -9,7 +9,7 @@ package container
import ( import (
"context" "context"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"github.com/moby/moby/client" "github.com/moby/moby/client"
) )
+4 -4
View File
@@ -21,10 +21,10 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/filecollector" "gitea.com/gitea/runner/v3/act/filecollector"
"gitea.com/gitea/runner/act/lookpath" "gitea.com/gitea/runner/v3/act/lookpath"
"gitea.com/gitea/runner/internal/pkg/process" "gitea.com/gitea/runner/v3/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"
+1 -1
View File
@@ -17,7 +17,7 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"io" "io"
"strings" "strings"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"golang.org/x/text/encoding/unicode" "golang.org/x/text/encoding/unicode"
"golang.org/x/text/transform" "golang.org/x/text/transform"
+1 -1
View File
@@ -18,7 +18,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/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"
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
"github.com/rhysd/actionlint" "github.com/rhysd/actionlint"
) )
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/common/git" "gitea.com/gitea/runner/v3/act/common/git"
) )
type GithubContext struct { type GithubContext struct {
+1 -1
View File
@@ -15,7 +15,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"go.yaml.in/yaml/v4" "go.yaml.in/yaml/v4"
+4 -4
View File
@@ -20,10 +20,10 @@ import (
"runtime" "runtime"
"strings" "strings"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/common/git" "gitea.com/gitea/runner/v3/act/common/git"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/v3/act/container"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
"github.com/kballard/go-shellquote" "github.com/kballard/go-shellquote"
) )
+2 -2
View File
@@ -17,8 +17,8 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
+2 -2
View File
@@ -12,8 +12,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/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 {
+4 -4
View File
@@ -13,10 +13,10 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/common/git" "gitea.com/gitea/runner/v3/act/common/git"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/v3/act/container"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
+3 -3
View File
@@ -8,9 +8,9 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/exprparser" "gitea.com/gitea/runner/v3/act/exprparser"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"regexp" "regexp"
"strings" "strings"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
) )
var commandPatternGA *regexp.Regexp var commandPatternGA *regexp.Regexp
+2 -2
View File
@@ -11,8 +11,8 @@ import (
"os" "os"
"testing" "testing"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
"github.com/sirupsen/logrus/hooks/test" "github.com/sirupsen/logrus/hooks/test"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"context" "context"
"io" "io"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/v3/act/container"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
) )
+4 -4
View File
@@ -16,10 +16,10 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/v3/act/container"
"gitea.com/gitea/runner/act/exprparser" "gitea.com/gitea/runner/v3/act/exprparser"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
_ "embed" _ "embed"
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"strings" "strings"
"testing" "testing"
"gitea.com/gitea/runner/act/exprparser" "gitea.com/gitea/runner/v3/act/exprparser"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
assert "github.com/stretchr/testify/assert" assert "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"runtime" "runtime"
"testing" "testing"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/v3/act/container"
mobyclient "github.com/moby/moby/client" mobyclient "github.com/moby/moby/client"
) )
+4 -4
View File
@@ -21,10 +21,10 @@ import (
"time" "time"
"unicode" "unicode"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/v3/act/container"
"gitea.com/gitea/runner/act/exprparser" "gitea.com/gitea/runner/v3/act/exprparser"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
) )
const maxJobSummaryBytes = 1024 * 1024 const maxJobSummaryBytes = 1024 * 1024
+3 -3
View File
@@ -20,9 +20,9 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/v3/act/container"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/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"
+2 -2
View File
@@ -11,8 +11,8 @@ import (
"path" "path"
"strings" "strings"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/v3/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.
+2 -2
View File
@@ -11,8 +11,8 @@ import (
"maps" "maps"
"testing" "testing"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
"github.com/sirupsen/logrus/hooks/test" "github.com/sirupsen/logrus/hooks/test"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
+1 -1
View File
@@ -16,7 +16,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"gitea.com/gitea/runner/act/filecollector" "gitea.com/gitea/runner/v3/act/filecollector"
) )
type LocalRepositoryCache struct { type LocalRepositoryCache struct {
+1 -1
View File
@@ -17,7 +17,7 @@ import (
"strings" "strings"
"sync" "sync"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/term" "golang.org/x/term"
+1 -1
View File
@@ -6,7 +6,7 @@ package runner
import ( import (
"testing" "testing"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"go.yaml.in/yaml/v4" "go.yaml.in/yaml/v4"
+3 -3
View File
@@ -14,9 +14,9 @@ import (
"regexp" "regexp"
"strings" "strings"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/common/git" "gitea.com/gitea/runner/v3/act/common/git"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
) )
func newLocalReusableWorkflowExecutor(rc *RunContext) common.Executor { func newLocalReusableWorkflowExecutor(rc *RunContext) common.Executor {
+2 -2
View File
@@ -13,8 +13,8 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common/git" "gitea.com/gitea/runner/v3/act/common/git"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
+5 -5
View File
@@ -25,11 +25,11 @@ import (
"sync" "sync"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/v3/act/container"
"gitea.com/gitea/runner/act/exprparser" "gitea.com/gitea/runner/v3/act/exprparser"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
"gitea.com/gitea/runner/internal/pkg/lock" "gitea.com/gitea/runner/v3/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"
+4 -4
View File
@@ -15,10 +15,10 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/v3/act/container"
"gitea.com/gitea/runner/act/exprparser" "gitea.com/gitea/runner/v3/act/exprparser"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/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"
+3 -3
View File
@@ -14,9 +14,9 @@ import (
"sync" "sync"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/v3/act/container"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/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"
+2 -2
View File
@@ -18,8 +18,8 @@ import (
"testing" "testing"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
"github.com/joho/godotenv" "github.com/joho/godotenv"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
+4 -4
View File
@@ -13,10 +13,10 @@ import (
"strings" "strings"
"time" "time"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/container" "gitea.com/gitea/runner/v3/act/container"
"gitea.com/gitea/runner/act/exprparser" "gitea.com/gitea/runner/v3/act/exprparser"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
) )
type step interface { type step interface {
+2 -2
View File
@@ -15,8 +15,8 @@ import (
"path" "path"
"path/filepath" "path/filepath"
"gitea.com/gitea/runner/act/common" "gitea.com/gitea/runner/v3/act/common"
"gitea.com/gitea/runner/act/model" "gitea.com/gitea/runner/v3/act/model"
) )
type stepActionLocal struct { type stepActionLocal struct {
Loaded 50 of 99 files, more files were not shown because too many files have changed in this diff. Show more