Skip to content

Commit

Permalink
chore: change go mod path and imports
Browse files Browse the repository at this point in the history
This simplifies the mod path now that we moved the code

Signed-off-by: Marvin Drees <[email protected]>
Signed-off-by: AtomicFS <[email protected]>
  • Loading branch information
MDr164 authored and AtomicFS committed Jan 8, 2025
1 parent a48e9b9 commit b3cb6c5
Show file tree
Hide file tree
Showing 18 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion cmd/firmware-action/container/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"strings"

"dagger.io/dagger"
"github.com/9elements/firmware-action/action/logging"
"github.com/9elements/firmware-action/logging"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/firmware-action/container/container_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"testing"

"dagger.io/dagger"
"github.com/9elements/firmware-action/action/filesystem"
"github.com/9elements/firmware-action/filesystem"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/firmware-action/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/9elements/firmware-action/action
module github.com/9elements/firmware-action

go 1.22.5

Expand Down
2 changes: 1 addition & 1 deletion cmd/firmware-action/logging/logging.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func InitLogger(level slog.Level, opts ...PrettyHandlerOption) {
// TrimNameFunction just trims the name
func TrimNameFunction(pc uintptr) string {
// 'runtime.FuncForPC(pc).Name()' is nice and all, but it will return this monstrosity:
// github.com/9elements/firmware-action/action/<package>.<func>...
// github.com/9elements/firmware-action/<package>.<func>...
// So this function is just to trim it down
// Usage:
// pc, _, _, _ := runtime.Caller(0)
Expand Down
6 changes: 3 additions & 3 deletions cmd/firmware-action/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"os"
"regexp"

"github.com/9elements/firmware-action/action/filesystem"
"github.com/9elements/firmware-action/action/logging"
"github.com/9elements/firmware-action/action/recipes"
"github.com/9elements/firmware-action/filesystem"
"github.com/9elements/firmware-action/logging"
"github.com/9elements/firmware-action/recipes"
"github.com/alecthomas/kong"
"github.com/go-git/go-git/v5"
"github.com/jedib0t/go-pretty/v6/table"
Expand Down
4 changes: 2 additions & 2 deletions cmd/firmware-action/recipes/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"strings"

"dagger.io/dagger"
"github.com/9elements/firmware-action/action/container"
"github.com/9elements/firmware-action/action/logging"
"github.com/9elements/firmware-action/container"
"github.com/9elements/firmware-action/logging"
"github.com/go-playground/validator/v10"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/firmware-action/recipes/coreboot.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"strings"

"dagger.io/dagger"
"github.com/9elements/firmware-action/action/container"
"github.com/9elements/firmware-action/action/filesystem"
"github.com/9elements/firmware-action/action/logging"
"github.com/9elements/firmware-action/container"
"github.com/9elements/firmware-action/filesystem"
"github.com/9elements/firmware-action/logging"
)

// BlobDef is used to store information about a single blob.
Expand Down
2 changes: 1 addition & 1 deletion cmd/firmware-action/recipes/coreboot_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"

"dagger.io/dagger"
"github.com/9elements/firmware-action/action/filesystem"
"github.com/9elements/firmware-action/filesystem"
"github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/firmware-action/recipes/edk2.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"runtime"

"dagger.io/dagger"
"github.com/9elements/firmware-action/action/container"
"github.com/9elements/firmware-action/container"
)

// ANCHOR: Edk2Specific
Expand Down
4 changes: 2 additions & 2 deletions cmd/firmware-action/recipes/linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"strings"

"dagger.io/dagger"
"github.com/9elements/firmware-action/action/container"
"github.com/9elements/firmware-action/action/logging"
"github.com/9elements/firmware-action/container"
"github.com/9elements/firmware-action/logging"
)

var errUnknownArchCrossCompile = errors.New("unknown architecture for cross-compilation")
Expand Down
2 changes: 1 addition & 1 deletion cmd/firmware-action/recipes/linux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"testing"

"dagger.io/dagger"
"github.com/9elements/firmware-action/action/filesystem"
"github.com/9elements/firmware-action/filesystem"
"github.com/Masterminds/semver"
"github.com/stretchr/testify/assert"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/firmware-action/recipes/recipes.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"sync"

"dagger.io/dagger"
"github.com/9elements/firmware-action/action/container"
"github.com/9elements/firmware-action/action/filesystem"
"github.com/9elements/firmware-action/container"
"github.com/9elements/firmware-action/filesystem"
"github.com/heimdalr/dag"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/firmware-action/recipes/stitching.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strings"

"dagger.io/dagger"
"github.com/9elements/firmware-action/action/container"
"github.com/9elements/firmware-action/action/logging"
"github.com/9elements/firmware-action/container"
"github.com/9elements/firmware-action/logging"
"github.com/dustin/go-humanize"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/firmware-action/recipes/stitching_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"testing"

"dagger.io/dagger"
"github.com/9elements/firmware-action/action/filesystem"
"github.com/9elements/firmware-action/filesystem"
"github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/firmware-action/recipes/universal.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"log/slog"

"dagger.io/dagger"
"github.com/9elements/firmware-action/action/container"
"github.com/9elements/firmware-action/container"
)

// UniversalSpecific is used to store data specific to the universal command module
Expand Down
2 changes: 1 addition & 1 deletion cmd/firmware-action/recipes/universal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"

"dagger.io/dagger"
"github.com/9elements/firmware-action/action/filesystem"
"github.com/9elements/firmware-action/filesystem"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/firmware-action/recipes/uroot.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"log/slog"

"dagger.io/dagger"
"github.com/9elements/firmware-action/action/container"
"github.com/9elements/firmware-action/container"
)

// URootSpecific is used to store data specific to u-root
Expand Down
2 changes: 1 addition & 1 deletion cmd/firmware-action/recipes/uroot_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"

"dagger.io/dagger"
"github.com/9elements/firmware-action/action/filesystem"
"github.com/9elements/firmware-action/filesystem"
"github.com/stretchr/testify/assert"
)

Expand Down

0 comments on commit b3cb6c5

Please sign in to comment.