mirror of
https://code.forgejo.org/forgejo/runner.git
synced 2025-09-15 18:57:01 +00:00
chore: to allow the runner to be imported, v9 needs to be in the go module (#777)
It will be imported by Forgejo. <!--start release-notes-assistant--> <!--URL:https://code.forgejo.org/forgejo/runner--> - other - [PR](https://code.forgejo.org/forgejo/runner/pulls/777): <!--number 777 --><!--line 0 --><!--description Y2hvcmU6IHRvIGFsbG93IHRoZSBydW5uZXIgdG8gYmUgaW1wb3J0ZWQsIHY5IG5lZWRzIHRvIGJlIGluIHRoZSBnbyBtb2R1bGU=-->chore: to allow the runner to be imported, v9 needs to be in the go module<!--description--> <!--end release-notes-assistant--> Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/777 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
f94fe37f90
commit
ec99579451
84 changed files with 172 additions and 172 deletions
|
@ -9,9 +9,9 @@ import (
|
|||
"os"
|
||||
"os/signal"
|
||||
|
||||
"code.forgejo.org/forgejo/runner/internal/pkg/config"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
|
||||
|
||||
"code.forgejo.org/forgejo/runner/act/artifactcache"
|
||||
"code.forgejo.org/forgejo/runner/v9/act/artifactcache"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
|
|
@ -10,8 +10,8 @@ import (
|
|||
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
"code.forgejo.org/forgejo/runner/internal/pkg/config"
|
||||
"code.forgejo.org/forgejo/runner/internal/pkg/ver"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/ver"
|
||||
)
|
||||
|
||||
func Execute(ctx context.Context) {
|
||||
|
|
|
@ -14,10 +14,10 @@ import (
|
|||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
"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"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/app/run"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/client"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/ver"
|
||||
)
|
||||
|
||||
type createRunnerFileArgs struct {
|
||||
|
|
|
@ -8,9 +8,9 @@ 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"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/client"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/ver"
|
||||
"connectrpc.com/connect"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
|
|
@ -18,13 +18,13 @@ import (
|
|||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
"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"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/app/poll"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/app/run"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/client"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/envcheck"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/labels"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/ver"
|
||||
)
|
||||
|
||||
func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error {
|
||||
|
|
|
@ -13,10 +13,10 @@ import (
|
|||
"strings"
|
||||
"time"
|
||||
|
||||
"code.forgejo.org/forgejo/runner/act/artifactcache"
|
||||
"code.forgejo.org/forgejo/runner/act/common"
|
||||
"code.forgejo.org/forgejo/runner/act/model"
|
||||
"code.forgejo.org/forgejo/runner/act/runner"
|
||||
"code.forgejo.org/forgejo/runner/v9/act/artifactcache"
|
||||
"code.forgejo.org/forgejo/runner/v9/act/common"
|
||||
"code.forgejo.org/forgejo/runner/v9/act/model"
|
||||
"code.forgejo.org/forgejo/runner/v9/act/runner"
|
||||
"github.com/docker/docker/api/types/container"
|
||||
"github.com/joho/godotenv"
|
||||
log "github.com/sirupsen/logrus"
|
||||
|
|
|
@ -13,13 +13,13 @@ import (
|
|||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
"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"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/app/job"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/app/run"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/client"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/envcheck"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/labels"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/ver"
|
||||
)
|
||||
|
||||
func runJob(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error {
|
||||
|
|
|
@ -10,7 +10,7 @@ import (
|
|||
"os"
|
||||
"testing"
|
||||
|
||||
"code.forgejo.org/forgejo/runner/testutils"
|
||||
"code.forgejo.org/forgejo/runner/v9/testutils"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
|
|
@ -20,10 +20,10 @@ import (
|
|||
log "github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
"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"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/client"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/labels"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/ver"
|
||||
)
|
||||
|
||||
// runRegister registers a runner to the server
|
||||
|
|
|
@ -13,8 +13,8 @@ import (
|
|||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"code.forgejo.org/forgejo/runner/act/model"
|
||||
"code.forgejo.org/forgejo/runner/testutils"
|
||||
"code.forgejo.org/forgejo/runner/v9/act/model"
|
||||
"code.forgejo.org/forgejo/runner/v9/testutils"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
|
|
@ -13,9 +13,9 @@ import (
|
|||
log "github.com/sirupsen/logrus"
|
||||
|
||||
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
|
||||
"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/v9/internal/app/run"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/client"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
|
||||
)
|
||||
|
||||
type Job struct {
|
||||
|
|
|
@ -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"
|
||||
"code.forgejo.org/forgejo/runner/internal/pkg/config"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
|
|
@ -15,9 +15,9 @@ import (
|
|||
log "github.com/sirupsen/logrus"
|
||||
"golang.org/x/time/rate"
|
||||
|
||||
"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/v9/internal/app/run"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/client"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
|
||||
)
|
||||
|
||||
const PollerID = "PollerID"
|
||||
|
|
|
@ -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"
|
||||
"code.forgejo.org/forgejo/runner/internal/pkg/config"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
|
|
@ -16,20 +16,20 @@ import (
|
|||
"time"
|
||||
|
||||
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
|
||||
"code.forgejo.org/forgejo/runner/act/artifactcache"
|
||||
"code.forgejo.org/forgejo/runner/act/cacheproxy"
|
||||
"code.forgejo.org/forgejo/runner/act/common"
|
||||
"code.forgejo.org/forgejo/runner/act/model"
|
||||
"code.forgejo.org/forgejo/runner/act/runner"
|
||||
"code.forgejo.org/forgejo/runner/v9/act/artifactcache"
|
||||
"code.forgejo.org/forgejo/runner/v9/act/cacheproxy"
|
||||
"code.forgejo.org/forgejo/runner/v9/act/common"
|
||||
"code.forgejo.org/forgejo/runner/v9/act/model"
|
||||
"code.forgejo.org/forgejo/runner/v9/act/runner"
|
||||
"connectrpc.com/connect"
|
||||
"github.com/docker/docker/api/types/container"
|
||||
log "github.com/sirupsen/logrus"
|
||||
|
||||
"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"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/client"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/config"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/labels"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/report"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/ver"
|
||||
)
|
||||
|
||||
// Runner runs the pipeline.
|
||||
|
|
|
@ -7,7 +7,7 @@ import (
|
|||
"testing"
|
||||
|
||||
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
|
||||
"code.forgejo.org/forgejo/runner/internal/pkg/labels"
|
||||
"code.forgejo.org/forgejo/runner/v9/internal/pkg/labels"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
|
|
@ -10,7 +10,7 @@ import (
|
|||
"strings"
|
||||
|
||||
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
|
||||
"code.forgejo.org/forgejo/runner/act/model"
|
||||
"code.forgejo.org/forgejo/runner/v9/act/model"
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ import (
|
|||
"testing"
|
||||
|
||||
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
|
||||
"code.forgejo.org/forgejo/runner/act/model"
|
||||
"code.forgejo.org/forgejo/runner/v9/act/model"
|
||||
"github.com/stretchr/testify/require"
|
||||
"gotest.tools/v3/assert"
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue