mirror of
https://code.forgejo.org/forgejo/runner.git
synced 2025-08-11 17:50:58 +00:00
chore: s|runner.forgejo.org|code.forgejo.org/forgejo/runner| (#747)
So that it can be used as a package. Not useful right away, but a precondition to merge the ACT repository into the runner repository. Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/747 Reviewed-by: Michael Kriese <michael.kriese@gmx.de> Co-authored-by: Earl Warren <contact@earl-warren.org> Co-committed-by: Earl Warren <contact@earl-warren.org>
This commit is contained in:
parent
0e6951213b
commit
b032f2a540
20 changed files with 51 additions and 51 deletions
2
.github/workflows/build-release.yml
vendored
2
.github/workflows/build-release.yml
vendored
|
@ -25,7 +25,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
env GOOS=windows GOARCH=${{matrix.architecture}} \
|
env GOOS=windows GOARCH=${{matrix.architecture}} \
|
||||||
go build \
|
go build \
|
||||||
-ldflags "-s -w -X runner.forgejo.org/internal/pkg/ver.version=${{ github.ref_name }}" \
|
-ldflags "-s -w -X code.forgejo.org/forgejo/runner/internal/pkg/ver.version=${{ github.ref_name }}" \
|
||||||
-o forgejo-runner-windows-${{matrix.architecture}}.exe
|
-o forgejo-runner-windows-${{matrix.architecture}}.exe
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v4
|
- uses: actions/upload-artifact@v4
|
||||||
|
|
4
Makefile
4
Makefile
|
@ -62,10 +62,10 @@ else
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
GO_PACKAGES_TO_VET ?= $(filter-out runner.forgejo.org/internal/pkg/client/mocks,$(shell $(GO) list ./...))
|
GO_PACKAGES_TO_VET ?= $(filter-out code.forgejo.org/forgejo/runner/internal/pkg/client/mocks,$(shell $(GO) list ./...))
|
||||||
|
|
||||||
TAGS ?=
|
TAGS ?=
|
||||||
LDFLAGS ?= -X "runner.forgejo.org/internal/pkg/ver.version=v$(RELEASE_VERSION)"
|
LDFLAGS ?= -X "code.forgejo.org/forgejo/runner/internal/pkg/ver.version=v$(RELEASE_VERSION)"
|
||||||
|
|
||||||
all: build
|
all: build
|
||||||
|
|
||||||
|
|
2
go.mod
2
go.mod
|
@ -1,4 +1,4 @@
|
||||||
module runner.forgejo.org
|
module code.forgejo.org/forgejo/runner
|
||||||
|
|
||||||
go 1.23.0
|
go 1.23.0
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
|
|
||||||
"runner.forgejo.org/internal/pkg/config"
|
"code.forgejo.org/forgejo/runner/internal/pkg/config"
|
||||||
|
|
||||||
"github.com/nektos/act/pkg/artifactcache"
|
"github.com/nektos/act/pkg/artifactcache"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
|
|
|
@ -10,8 +10,8 @@ import (
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
"runner.forgejo.org/internal/pkg/config"
|
"code.forgejo.org/forgejo/runner/internal/pkg/config"
|
||||||
"runner.forgejo.org/internal/pkg/ver"
|
"code.forgejo.org/forgejo/runner/internal/pkg/ver"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Execute(ctx context.Context) {
|
func Execute(ctx context.Context) {
|
||||||
|
|
|
@ -14,10 +14,10 @@ import (
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
"runner.forgejo.org/internal/app/run"
|
"code.forgejo.org/forgejo/runner/internal/app/run"
|
||||||
"runner.forgejo.org/internal/pkg/client"
|
"code.forgejo.org/forgejo/runner/internal/pkg/client"
|
||||||
"runner.forgejo.org/internal/pkg/config"
|
"code.forgejo.org/forgejo/runner/internal/pkg/config"
|
||||||
"runner.forgejo.org/internal/pkg/ver"
|
"code.forgejo.org/forgejo/runner/internal/pkg/ver"
|
||||||
)
|
)
|
||||||
|
|
||||||
type createRunnerFileArgs struct {
|
type createRunnerFileArgs struct {
|
||||||
|
|
|
@ -9,10 +9,10 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
|
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
|
||||||
|
"code.forgejo.org/forgejo/runner/internal/pkg/client"
|
||||||
|
"code.forgejo.org/forgejo/runner/internal/pkg/config"
|
||||||
|
"code.forgejo.org/forgejo/runner/internal/pkg/ver"
|
||||||
"connectrpc.com/connect"
|
"connectrpc.com/connect"
|
||||||
"runner.forgejo.org/internal/pkg/client"
|
|
||||||
"runner.forgejo.org/internal/pkg/config"
|
|
||||||
"runner.forgejo.org/internal/pkg/ver"
|
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
|
|
@ -18,13 +18,13 @@ import (
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
"runner.forgejo.org/internal/app/poll"
|
"code.forgejo.org/forgejo/runner/internal/app/poll"
|
||||||
"runner.forgejo.org/internal/app/run"
|
"code.forgejo.org/forgejo/runner/internal/app/run"
|
||||||
"runner.forgejo.org/internal/pkg/client"
|
"code.forgejo.org/forgejo/runner/internal/pkg/client"
|
||||||
"runner.forgejo.org/internal/pkg/config"
|
"code.forgejo.org/forgejo/runner/internal/pkg/config"
|
||||||
"runner.forgejo.org/internal/pkg/envcheck"
|
"code.forgejo.org/forgejo/runner/internal/pkg/envcheck"
|
||||||
"runner.forgejo.org/internal/pkg/labels"
|
"code.forgejo.org/forgejo/runner/internal/pkg/labels"
|
||||||
"runner.forgejo.org/internal/pkg/ver"
|
"code.forgejo.org/forgejo/runner/internal/pkg/ver"
|
||||||
)
|
)
|
||||||
|
|
||||||
func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error {
|
func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error {
|
||||||
|
|
|
@ -13,13 +13,13 @@ import (
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
"runner.forgejo.org/internal/app/job"
|
"code.forgejo.org/forgejo/runner/internal/app/job"
|
||||||
"runner.forgejo.org/internal/app/run"
|
"code.forgejo.org/forgejo/runner/internal/app/run"
|
||||||
"runner.forgejo.org/internal/pkg/client"
|
"code.forgejo.org/forgejo/runner/internal/pkg/client"
|
||||||
"runner.forgejo.org/internal/pkg/config"
|
"code.forgejo.org/forgejo/runner/internal/pkg/config"
|
||||||
"runner.forgejo.org/internal/pkg/envcheck"
|
"code.forgejo.org/forgejo/runner/internal/pkg/envcheck"
|
||||||
"runner.forgejo.org/internal/pkg/labels"
|
"code.forgejo.org/forgejo/runner/internal/pkg/labels"
|
||||||
"runner.forgejo.org/internal/pkg/ver"
|
"code.forgejo.org/forgejo/runner/internal/pkg/ver"
|
||||||
)
|
)
|
||||||
|
|
||||||
func runJob(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error {
|
func runJob(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error {
|
||||||
|
|
|
@ -20,10 +20,10 @@ import (
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
"runner.forgejo.org/internal/pkg/client"
|
"code.forgejo.org/forgejo/runner/internal/pkg/client"
|
||||||
"runner.forgejo.org/internal/pkg/config"
|
"code.forgejo.org/forgejo/runner/internal/pkg/config"
|
||||||
"runner.forgejo.org/internal/pkg/labels"
|
"code.forgejo.org/forgejo/runner/internal/pkg/labels"
|
||||||
"runner.forgejo.org/internal/pkg/ver"
|
"code.forgejo.org/forgejo/runner/internal/pkg/ver"
|
||||||
)
|
)
|
||||||
|
|
||||||
// runRegister registers a runner to the server
|
// runRegister registers a runner to the server
|
||||||
|
|
|
@ -13,9 +13,9 @@ import (
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
|
|
||||||
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
|
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
|
||||||
"runner.forgejo.org/internal/app/run"
|
"code.forgejo.org/forgejo/runner/internal/app/run"
|
||||||
"runner.forgejo.org/internal/pkg/client"
|
"code.forgejo.org/forgejo/runner/internal/pkg/client"
|
||||||
"runner.forgejo.org/internal/pkg/config"
|
"code.forgejo.org/forgejo/runner/internal/pkg/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Job struct {
|
type Job struct {
|
||||||
|
|
|
@ -11,7 +11,7 @@ import (
|
||||||
"code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect"
|
"code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect"
|
||||||
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
|
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
|
||||||
"code.forgejo.org/forgejo/actions-proto/runner/v1/runnerv1connect"
|
"code.forgejo.org/forgejo/actions-proto/runner/v1/runnerv1connect"
|
||||||
"runner.forgejo.org/internal/pkg/config"
|
"code.forgejo.org/forgejo/runner/internal/pkg/config"
|
||||||
|
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
|
|
@ -15,9 +15,9 @@ import (
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"golang.org/x/time/rate"
|
"golang.org/x/time/rate"
|
||||||
|
|
||||||
"runner.forgejo.org/internal/app/run"
|
"code.forgejo.org/forgejo/runner/internal/app/run"
|
||||||
"runner.forgejo.org/internal/pkg/client"
|
"code.forgejo.org/forgejo/runner/internal/pkg/client"
|
||||||
"runner.forgejo.org/internal/pkg/config"
|
"code.forgejo.org/forgejo/runner/internal/pkg/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
const PollerID = "PollerID"
|
const PollerID = "PollerID"
|
||||||
|
|
|
@ -14,7 +14,7 @@ import (
|
||||||
"code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect"
|
"code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect"
|
||||||
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
|
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
|
||||||
"code.forgejo.org/forgejo/actions-proto/runner/v1/runnerv1connect"
|
"code.forgejo.org/forgejo/actions-proto/runner/v1/runnerv1connect"
|
||||||
"runner.forgejo.org/internal/pkg/config"
|
"code.forgejo.org/forgejo/runner/internal/pkg/config"
|
||||||
|
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
|
|
@ -25,11 +25,11 @@ import (
|
||||||
"github.com/nektos/act/pkg/runner"
|
"github.com/nektos/act/pkg/runner"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
|
|
||||||
"runner.forgejo.org/internal/pkg/client"
|
"code.forgejo.org/forgejo/runner/internal/pkg/client"
|
||||||
"runner.forgejo.org/internal/pkg/config"
|
"code.forgejo.org/forgejo/runner/internal/pkg/config"
|
||||||
"runner.forgejo.org/internal/pkg/labels"
|
"code.forgejo.org/forgejo/runner/internal/pkg/labels"
|
||||||
"runner.forgejo.org/internal/pkg/report"
|
"code.forgejo.org/forgejo/runner/internal/pkg/report"
|
||||||
"runner.forgejo.org/internal/pkg/ver"
|
"code.forgejo.org/forgejo/runner/internal/pkg/ver"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Runner runs the pipeline.
|
// Runner runs the pipeline.
|
||||||
|
|
|
@ -7,7 +7,7 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
|
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
|
||||||
"runner.forgejo.org/internal/pkg/labels"
|
"code.forgejo.org/forgejo/runner/internal/pkg/labels"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"google.golang.org/protobuf/proto"
|
"google.golang.org/protobuf/proto"
|
||||||
"google.golang.org/protobuf/types/known/timestamppb"
|
"google.golang.org/protobuf/types/known/timestamppb"
|
||||||
|
|
||||||
"runner.forgejo.org/internal/pkg/client"
|
"code.forgejo.org/forgejo/runner/internal/pkg/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
|
|
@ -20,8 +20,8 @@ import (
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
"google.golang.org/protobuf/types/known/structpb"
|
"google.golang.org/protobuf/types/known/structpb"
|
||||||
|
|
||||||
"runner.forgejo.org/internal/pkg/client/mocks"
|
"code.forgejo.org/forgejo/runner/internal/pkg/client/mocks"
|
||||||
"runner.forgejo.org/internal/pkg/testutils"
|
"code.forgejo.org/forgejo/runner/internal/pkg/testutils"
|
||||||
)
|
)
|
||||||
|
|
||||||
func rowsToString(rows []*runnerv1.LogRow) string {
|
func rowsToString(rows []*runnerv1.LogRow) string {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
package ver
|
package ver
|
||||||
|
|
||||||
// go build -ldflags "-X runner.forgejo.org/internal/pkg/ver.version=1.2.3"
|
// go build -ldflags "-X code.forgejo.org/forgejo/runner/internal/pkg/ver.version=1.2.3"
|
||||||
var version = "dev"
|
var version = "dev"
|
||||||
|
|
||||||
func Version() string {
|
func Version() string {
|
||||||
|
|
2
main.go
2
main.go
|
@ -8,7 +8,7 @@ import (
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
"runner.forgejo.org/internal/app/cmd"
|
"code.forgejo.org/forgejo/runner/internal/app/cmd"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue