diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 77de8b65..d179d7bb 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -25,7 +25,7 @@ jobs: run: | env GOOS=windows GOARCH=${{matrix.architecture}} \ 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 - uses: actions/upload-artifact@v4 diff --git a/Makefile b/Makefile index a5145fdd..986c327d 100644 --- a/Makefile +++ b/Makefile @@ -62,10 +62,10 @@ else 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 ?= -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 diff --git a/go.mod b/go.mod index ab7ebff0..1d38883d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module runner.forgejo.org +module code.forgejo.org/forgejo/runner go 1.23.0 diff --git a/internal/app/cmd/cache-server.go b/internal/app/cmd/cache-server.go index 8701b558..9e18b530 100644 --- a/internal/app/cmd/cache-server.go +++ b/internal/app/cmd/cache-server.go @@ -9,7 +9,7 @@ import ( "os" "os/signal" - "runner.forgejo.org/internal/pkg/config" + "code.forgejo.org/forgejo/runner/internal/pkg/config" "github.com/nektos/act/pkg/artifactcache" log "github.com/sirupsen/logrus" diff --git a/internal/app/cmd/cmd.go b/internal/app/cmd/cmd.go index d4f7ce8a..09efd70e 100644 --- a/internal/app/cmd/cmd.go +++ b/internal/app/cmd/cmd.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/cobra" - "runner.forgejo.org/internal/pkg/config" - "runner.forgejo.org/internal/pkg/ver" + "code.forgejo.org/forgejo/runner/internal/pkg/config" + "code.forgejo.org/forgejo/runner/internal/pkg/ver" ) func Execute(ctx context.Context) { diff --git a/internal/app/cmd/create-runner-file.go b/internal/app/cmd/create-runner-file.go index 3ac13c61..fdfc65e9 100644 --- a/internal/app/cmd/create-runner-file.go +++ b/internal/app/cmd/create-runner-file.go @@ -14,10 +14,10 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "runner.forgejo.org/internal/app/run" - "runner.forgejo.org/internal/pkg/client" - "runner.forgejo.org/internal/pkg/config" - "runner.forgejo.org/internal/pkg/ver" + "code.forgejo.org/forgejo/runner/internal/app/run" + "code.forgejo.org/forgejo/runner/internal/pkg/client" + "code.forgejo.org/forgejo/runner/internal/pkg/config" + "code.forgejo.org/forgejo/runner/internal/pkg/ver" ) type createRunnerFileArgs struct { diff --git a/internal/app/cmd/create-runner-file_test.go b/internal/app/cmd/create-runner-file_test.go index 2a4925c5..275b7101 100644 --- a/internal/app/cmd/create-runner-file_test.go +++ b/internal/app/cmd/create-runner-file_test.go @@ -9,10 +9,10 @@ import ( "testing" 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" - "runner.forgejo.org/internal/pkg/client" - "runner.forgejo.org/internal/pkg/config" - "runner.forgejo.org/internal/pkg/ver" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" diff --git a/internal/app/cmd/daemon.go b/internal/app/cmd/daemon.go index 16fe1aa9..592372dc 100644 --- a/internal/app/cmd/daemon.go +++ b/internal/app/cmd/daemon.go @@ -18,13 +18,13 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "runner.forgejo.org/internal/app/poll" - "runner.forgejo.org/internal/app/run" - "runner.forgejo.org/internal/pkg/client" - "runner.forgejo.org/internal/pkg/config" - "runner.forgejo.org/internal/pkg/envcheck" - "runner.forgejo.org/internal/pkg/labels" - "runner.forgejo.org/internal/pkg/ver" + "code.forgejo.org/forgejo/runner/internal/app/poll" + "code.forgejo.org/forgejo/runner/internal/app/run" + "code.forgejo.org/forgejo/runner/internal/pkg/client" + "code.forgejo.org/forgejo/runner/internal/pkg/config" + "code.forgejo.org/forgejo/runner/internal/pkg/envcheck" + "code.forgejo.org/forgejo/runner/internal/pkg/labels" + "code.forgejo.org/forgejo/runner/internal/pkg/ver" ) func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error { diff --git a/internal/app/cmd/job.go b/internal/app/cmd/job.go index 63251245..b195a86a 100644 --- a/internal/app/cmd/job.go +++ b/internal/app/cmd/job.go @@ -13,13 +13,13 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "runner.forgejo.org/internal/app/job" - "runner.forgejo.org/internal/app/run" - "runner.forgejo.org/internal/pkg/client" - "runner.forgejo.org/internal/pkg/config" - "runner.forgejo.org/internal/pkg/envcheck" - "runner.forgejo.org/internal/pkg/labels" - "runner.forgejo.org/internal/pkg/ver" + "code.forgejo.org/forgejo/runner/internal/app/job" + "code.forgejo.org/forgejo/runner/internal/app/run" + "code.forgejo.org/forgejo/runner/internal/pkg/client" + "code.forgejo.org/forgejo/runner/internal/pkg/config" + "code.forgejo.org/forgejo/runner/internal/pkg/envcheck" + "code.forgejo.org/forgejo/runner/internal/pkg/labels" + "code.forgejo.org/forgejo/runner/internal/pkg/ver" ) func runJob(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error { diff --git a/internal/app/cmd/register.go b/internal/app/cmd/register.go index 0d1f46d7..8e66cb89 100644 --- a/internal/app/cmd/register.go +++ b/internal/app/cmd/register.go @@ -20,10 +20,10 @@ import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "runner.forgejo.org/internal/pkg/client" - "runner.forgejo.org/internal/pkg/config" - "runner.forgejo.org/internal/pkg/labels" - "runner.forgejo.org/internal/pkg/ver" + "code.forgejo.org/forgejo/runner/internal/pkg/client" + "code.forgejo.org/forgejo/runner/internal/pkg/config" + "code.forgejo.org/forgejo/runner/internal/pkg/labels" + "code.forgejo.org/forgejo/runner/internal/pkg/ver" ) // runRegister registers a runner to the server diff --git a/internal/app/job/job.go b/internal/app/job/job.go index 6fe6cfc9..9a7638a1 100644 --- a/internal/app/job/job.go +++ b/internal/app/job/job.go @@ -13,9 +13,9 @@ import ( log "github.com/sirupsen/logrus" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" - "runner.forgejo.org/internal/app/run" - "runner.forgejo.org/internal/pkg/client" - "runner.forgejo.org/internal/pkg/config" + "code.forgejo.org/forgejo/runner/internal/app/run" + "code.forgejo.org/forgejo/runner/internal/pkg/client" + "code.forgejo.org/forgejo/runner/internal/pkg/config" ) type Job struct { diff --git a/internal/app/job/job_test.go b/internal/app/job/job_test.go index 22784a5a..8d4376b0 100644 --- a/internal/app/job/job_test.go +++ b/internal/app/job/job_test.go @@ -11,7 +11,7 @@ import ( "code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" "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" "github.com/stretchr/testify/assert" diff --git a/internal/app/poll/poller.go b/internal/app/poll/poller.go index 22e54874..61b1c2ff 100644 --- a/internal/app/poll/poller.go +++ b/internal/app/poll/poller.go @@ -15,9 +15,9 @@ import ( log "github.com/sirupsen/logrus" "golang.org/x/time/rate" - "runner.forgejo.org/internal/app/run" - "runner.forgejo.org/internal/pkg/client" - "runner.forgejo.org/internal/pkg/config" + "code.forgejo.org/forgejo/runner/internal/app/run" + "code.forgejo.org/forgejo/runner/internal/pkg/client" + "code.forgejo.org/forgejo/runner/internal/pkg/config" ) const PollerID = "PollerID" diff --git a/internal/app/poll/poller_test.go b/internal/app/poll/poller_test.go index ed0dd89c..eedc0fee 100644 --- a/internal/app/poll/poller_test.go +++ b/internal/app/poll/poller_test.go @@ -14,7 +14,7 @@ import ( "code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect" runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1" "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" "github.com/stretchr/testify/assert" diff --git a/internal/app/run/runner.go b/internal/app/run/runner.go index 20dd1106..f2b12350 100644 --- a/internal/app/run/runner.go +++ b/internal/app/run/runner.go @@ -25,11 +25,11 @@ import ( "github.com/nektos/act/pkg/runner" log "github.com/sirupsen/logrus" - "runner.forgejo.org/internal/pkg/client" - "runner.forgejo.org/internal/pkg/config" - "runner.forgejo.org/internal/pkg/labels" - "runner.forgejo.org/internal/pkg/report" - "runner.forgejo.org/internal/pkg/ver" + "code.forgejo.org/forgejo/runner/internal/pkg/client" + "code.forgejo.org/forgejo/runner/internal/pkg/config" + "code.forgejo.org/forgejo/runner/internal/pkg/labels" + "code.forgejo.org/forgejo/runner/internal/pkg/report" + "code.forgejo.org/forgejo/runner/internal/pkg/ver" ) // Runner runs the pipeline. diff --git a/internal/app/run/runner_test.go b/internal/app/run/runner_test.go index ae0470c9..849b95a4 100644 --- a/internal/app/run/runner_test.go +++ b/internal/app/run/runner_test.go @@ -7,7 +7,7 @@ import ( "testing" 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" ) diff --git a/internal/pkg/report/reporter.go b/internal/pkg/report/reporter.go index 4ecd8b9c..518fa6ac 100644 --- a/internal/pkg/report/reporter.go +++ b/internal/pkg/report/reporter.go @@ -19,7 +19,7 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/timestamppb" - "runner.forgejo.org/internal/pkg/client" + "code.forgejo.org/forgejo/runner/internal/pkg/client" ) var ( diff --git a/internal/pkg/report/reporter_test.go b/internal/pkg/report/reporter_test.go index 2cde55ce..4f110ce1 100644 --- a/internal/pkg/report/reporter_test.go +++ b/internal/pkg/report/reporter_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/structpb" - "runner.forgejo.org/internal/pkg/client/mocks" - "runner.forgejo.org/internal/pkg/testutils" + "code.forgejo.org/forgejo/runner/internal/pkg/client/mocks" + "code.forgejo.org/forgejo/runner/internal/pkg/testutils" ) func rowsToString(rows []*runnerv1.LogRow) string { diff --git a/internal/pkg/ver/version.go b/internal/pkg/ver/version.go index cbf46414..e843ec21 100644 --- a/internal/pkg/ver/version.go +++ b/internal/pkg/ver/version.go @@ -3,7 +3,7 @@ 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" func Version() string { diff --git a/main.go b/main.go index 40886589..18eeee6e 100644 --- a/main.go +++ b/main.go @@ -8,7 +8,7 @@ import ( "os/signal" "syscall" - "runner.forgejo.org/internal/app/cmd" + "code.forgejo.org/forgejo/runner/internal/app/cmd" ) func main() {