Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change module version to v2 #132

Closed
wants to merge 5 commits into from
Closed

change module version to v2 #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c58f5c
change module version to v2
richardbremner May 31, 2024
2738fb4
change modules to refer to v2
richardbremner May 31, 2024
9e6a644
change imports to refer to v2
richardbremner May 31, 2024
7de08e6
change imports to refer to v2
richardbremner May 31, 2024
3c5ff31
change imports to refer to v2
richardbremner May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
output_dir="build/${os}-${arch}"
output_name="lilypad-${os}-${arch}"
mkdir -p "${output_dir}"
GOOS=${os} GOARCH=${arch} go build -o "${output_dir}/${output_name}" -v -ldflags="-X 'github.com/lilypad-tech/lilypad/cmd/lilypad.VERSION=$(git describe --tags --abbrev=0)' \
-X 'github.com/lilypad-tech/lilypad/cmd/lilypad.COMMIT_SHA=$(git rev-parse HEAD)'"
GOOS=${os} GOARCH=${arch} go build -o "${output_dir}/${output_name}" -v -ldflags="-X 'github.com/lilypad-tech/lilypad/v2/cmd/lilypad.VERSION=$(git describe --tags --abbrev=0)' \
-X 'github.com/lilypad-tech/lilypad/v2/cmd/lilypad.COMMIT_SHA=$(git rev-parse HEAD)'"
done
done
- persist_to_workspace:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
release:
go build -v -ldflags="\
-X 'github.com/lilypad-tech/lilypad/cmd/lilypad.VERSION=$$(git describe --tags --abbrev=0)' \
-X 'github.com/lilypad-tech/lilypad/cmd/lilypad.COMMIT_SHA=$$(git rev-parse HEAD)' \
-X 'github.com/lilypad-tech/lilypad/v2/cmd/lilypad.VERSION=$$(git describe --tags --abbrev=0)' \
-X 'github.com/lilypad-tech/lilypad/v2/cmd/lilypad.COMMIT_SHA=$$(git rev-parse HEAD)' \
" -o bin/
./bin/lilypad version

Expand Down
8 changes: 4 additions & 4 deletions cmd/lilypad/jobcreator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package lilypad

import (
"github.com/lilypad-tech/lilypad/pkg/jobcreator"
optionsfactory "github.com/lilypad-tech/lilypad/pkg/options"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
"github.com/lilypad-tech/lilypad/v2/pkg/jobcreator"
optionsfactory "github.com/lilypad-tech/lilypad/v2/pkg/options"
"github.com/lilypad-tech/lilypad/v2/pkg/system"
"github.com/lilypad-tech/lilypad/v2/pkg/web3"
"github.com/spf13/cobra"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/lilypad/mediator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package lilypad

import (
"github.com/lilypad-tech/lilypad/pkg/executor/bacalhau"
"github.com/lilypad-tech/lilypad/pkg/mediator"
optionsfactory "github.com/lilypad-tech/lilypad/pkg/options"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
"github.com/lilypad-tech/lilypad/v2/pkg/executor/bacalhau"
"github.com/lilypad-tech/lilypad/v2/pkg/mediator"
optionsfactory "github.com/lilypad-tech/lilypad/v2/pkg/options"
"github.com/lilypad-tech/lilypad/v2/pkg/system"
"github.com/lilypad-tech/lilypad/v2/pkg/web3"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
)
Expand Down
10 changes: 5 additions & 5 deletions cmd/lilypad/resource-provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package lilypad

import (
"github.com/lilypad-tech/lilypad/pkg/executor/bacalhau"
optionsfactory "github.com/lilypad-tech/lilypad/pkg/options"
"github.com/lilypad-tech/lilypad/pkg/resourceprovider"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
"github.com/lilypad-tech/lilypad/v2/pkg/executor/bacalhau"
optionsfactory "github.com/lilypad-tech/lilypad/v2/pkg/options"
"github.com/lilypad-tech/lilypad/v2/pkg/resourceprovider"
"github.com/lilypad-tech/lilypad/v2/pkg/system"
"github.com/lilypad-tech/lilypad/v2/pkg/web3"
"github.com/spf13/cobra"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/lilypad/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"syscall"
"time"

"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/jobcreator"
optionsfactory "github.com/lilypad-tech/lilypad/pkg/options"
"github.com/lilypad-tech/lilypad/pkg/solver"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/fatih/color"
"github.com/lilypad-tech/lilypad/v2/pkg/data"
"github.com/lilypad-tech/lilypad/v2/pkg/jobcreator"
optionsfactory "github.com/lilypad-tech/lilypad/v2/pkg/options"
"github.com/lilypad-tech/lilypad/v2/pkg/solver"
"github.com/lilypad-tech/lilypad/v2/pkg/system"
"github.com/spf13/cobra"

"github.com/theckman/yacspin"
Expand Down
10 changes: 5 additions & 5 deletions cmd/lilypad/solver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package lilypad

import (
optionsfactory "github.com/lilypad-tech/lilypad/pkg/options"
"github.com/lilypad-tech/lilypad/pkg/solver"
memorystore "github.com/lilypad-tech/lilypad/pkg/solver/store/memory"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
optionsfactory "github.com/lilypad-tech/lilypad/v2/pkg/options"
"github.com/lilypad-tech/lilypad/v2/pkg/solver"
memorystore "github.com/lilypad-tech/lilypad/v2/pkg/solver/store/memory"
"github.com/lilypad-tech/lilypad/v2/pkg/system"
"github.com/lilypad-tech/lilypad/v2/pkg/web3"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/lilypad/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/spf13/cobra"

optionsfactory "github.com/lilypad-tech/lilypad/pkg/options"
"github.com/lilypad-tech/lilypad/pkg/system"
optionsfactory "github.com/lilypad-tech/lilypad/v2/pkg/options"
"github.com/lilypad-tech/lilypad/v2/pkg/system"
)

var VERSION string
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/lilypad-tech/lilypad
module github.com/lilypad-tech/lilypad/v2

go 1.20

Expand Down Expand Up @@ -112,4 +112,4 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/blake3 v1.1.7 // indirect
rsc.io/tmplfunc v0.0.3 // indirect
)
)
4 changes: 2 additions & 2 deletions justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ default: go build

release:
go build -v -ldflags="\
-X 'github.com/lilypad-tech/lilypad/cmd/lilypad.VERSION=$$(git describe --tags --abbrev=0)' \
-X 'github.com/lilypad-tech/lilypad/cmd/lilypad.COMMIT_SHA=$$(git rev-parse HEAD)' \
-X 'github.com/lilypad-tech/lilypad/v2/cmd/lilypad.VERSION=$$(git describe --tags --abbrev=0)' \
-X 'github.com/lilypad-tech/lilypad/v2/cmd/lilypad.COMMIT_SHA=$$(git rev-parse HEAD)' \
" .
./lilypad version
2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/lilypad-tech/lilypad/cmd/lilypad"
"github.com/lilypad-tech/lilypad/v2/cmd/lilypad"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/data/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package data

import (
"github.com/lilypad-tech/lilypad/pkg/data/bacalhau"
"github.com/lilypad-tech/lilypad/v2/pkg/data/bacalhau"
)

// used by resource providers to describe their resources
Expand Down
2 changes: 1 addition & 1 deletion pkg/data/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"math/big"

"github.com/lilypad-tech/lilypad/pkg/web3/bindings/controller"
"github.com/ethereum/go-ethereum/common"
"github.com/lilypad-tech/lilypad/v2/pkg/web3/bindings/controller"

mdag "github.com/ipfs/go-merkledag"
)
Expand Down
8 changes: 4 additions & 4 deletions pkg/executor/bacalhau/bacalhau.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"path/filepath"
"strings"

"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/data/bacalhau"
executorlib "github.com/lilypad-tech/lilypad/pkg/executor"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/v2/pkg/data"
"github.com/lilypad-tech/lilypad/v2/pkg/data/bacalhau"
executorlib "github.com/lilypad-tech/lilypad/v2/pkg/executor"
"github.com/lilypad-tech/lilypad/v2/pkg/system"
"github.com/rs/zerolog/log"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/executor/noop/noop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"path/filepath"

"github.com/lilypad-tech/lilypad/pkg/data"
executorlib "github.com/lilypad-tech/lilypad/pkg/executor"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/v2/pkg/data"
executorlib "github.com/lilypad-tech/lilypad/v2/pkg/executor"
"github.com/lilypad-tech/lilypad/v2/pkg/system"
)

const RESULTS_DIR = "noop-results"
Expand Down
2 changes: 1 addition & 1 deletion pkg/executor/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package executor

import (
"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/v2/pkg/data"
)

type ExecutorResults struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/http/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"net/url"
"strings"

"github.com/lilypad-tech/lilypad/pkg/web3"
"github.com/hashicorp/go-retryablehttp"
"github.com/lilypad-tech/lilypad/v2/pkg/web3"
"github.com/rs/zerolog/log"
)

Expand Down
14 changes: 7 additions & 7 deletions pkg/jobcreator/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"fmt"
"time"

"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/http"
"github.com/lilypad-tech/lilypad/pkg/solver"
"github.com/lilypad-tech/lilypad/pkg/solver/store"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
"github.com/lilypad-tech/lilypad/pkg/web3/bindings/storage"
"github.com/lilypad-tech/lilypad/v2/pkg/data"
"github.com/lilypad-tech/lilypad/v2/pkg/http"
"github.com/lilypad-tech/lilypad/v2/pkg/solver"
"github.com/lilypad-tech/lilypad/v2/pkg/solver/store"
"github.com/lilypad-tech/lilypad/v2/pkg/system"
"github.com/lilypad-tech/lilypad/v2/pkg/web3"
"github.com/lilypad-tech/lilypad/v2/pkg/web3/bindings/storage"
)

type JobOfferSubscriber func(offer data.JobOfferContainer)
Expand Down
6 changes: 3 additions & 3 deletions pkg/jobcreator/jobcreator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package jobcreator
import (
"context"

"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
"github.com/lilypad-tech/lilypad/v2/pkg/data"
"github.com/lilypad-tech/lilypad/v2/pkg/system"
"github.com/lilypad-tech/lilypad/v2/pkg/web3"
)

type JobCreatorMediationOptions struct {
Expand Down
10 changes: 5 additions & 5 deletions pkg/jobcreator/onchain_jobcreator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"strings"

"github.com/davecgh/go-spew/spew"
"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/metricsDashboard"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
jobcreatorweb3 "github.com/lilypad-tech/lilypad/pkg/web3/bindings/jobcreator"
"github.com/lilypad-tech/lilypad/v2/pkg/data"
"github.com/lilypad-tech/lilypad/v2/pkg/metricsDashboard"
"github.com/lilypad-tech/lilypad/v2/pkg/system"
"github.com/lilypad-tech/lilypad/v2/pkg/web3"
jobcreatorweb3 "github.com/lilypad-tech/lilypad/v2/pkg/web3/bindings/jobcreator"
)

const JOB_PRICE = 2
Expand Down
6 changes: 3 additions & 3 deletions pkg/jobcreator/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"time"

"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
"github.com/lilypad-tech/lilypad/v2/pkg/data"
"github.com/lilypad-tech/lilypad/v2/pkg/system"
"github.com/lilypad-tech/lilypad/v2/pkg/web3"
)

type RunJobResults struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/jobcreator/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"time"

"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/module"
"github.com/lilypad-tech/lilypad/v2/pkg/data"
"github.com/lilypad-tech/lilypad/v2/pkg/module"
)

// this will load the module in the offer options
Expand Down
16 changes: 8 additions & 8 deletions pkg/mediator/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import (
"sync"
"time"

"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/executor"
"github.com/lilypad-tech/lilypad/pkg/http"
"github.com/lilypad-tech/lilypad/pkg/module"
"github.com/lilypad-tech/lilypad/pkg/solver"
"github.com/lilypad-tech/lilypad/pkg/solver/store"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
"github.com/lilypad-tech/lilypad/v2/pkg/data"
"github.com/lilypad-tech/lilypad/v2/pkg/executor"
"github.com/lilypad-tech/lilypad/v2/pkg/http"
"github.com/lilypad-tech/lilypad/v2/pkg/module"
"github.com/lilypad-tech/lilypad/v2/pkg/solver"
"github.com/lilypad-tech/lilypad/v2/pkg/solver/store"
"github.com/lilypad-tech/lilypad/v2/pkg/system"
"github.com/lilypad-tech/lilypad/v2/pkg/web3"
"github.com/rs/zerolog/log"
)

Expand Down
10 changes: 5 additions & 5 deletions pkg/mediator/mediator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package mediator
import (
"context"

"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/executor"
"github.com/lilypad-tech/lilypad/pkg/executor/bacalhau"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
"github.com/lilypad-tech/lilypad/v2/pkg/data"
"github.com/lilypad-tech/lilypad/v2/pkg/executor"
"github.com/lilypad-tech/lilypad/v2/pkg/executor/bacalhau"
"github.com/lilypad-tech/lilypad/v2/pkg/system"
"github.com/lilypad-tech/lilypad/v2/pkg/web3"
"github.com/rs/zerolog/log"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/metricsDashboard/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"time"

"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/v2/pkg/data"
)

var host = os.Getenv("API_HOST")
Expand Down
2 changes: 1 addition & 1 deletion pkg/module/shortcuts/shortcuts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/v2/pkg/data"
)

// allow shortcode github.com/lukemarsden/lilypad-sdxl:v0.0.1 (tag),
Expand Down
6 changes: 3 additions & 3 deletions pkg/module/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"github.com/go-git/go-git/v5/plumbing"
"github.com/rs/zerolog/log"

"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/module/shortcuts"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/v2/pkg/data"
"github.com/lilypad-tech/lilypad/v2/pkg/module/shortcuts"
"github.com/lilypad-tech/lilypad/v2/pkg/system"
)

const REPO_DIR = "repos"
Expand Down
2 changes: 1 addition & 1 deletion pkg/module/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/v2/pkg/data"
)

func TestPrepareModule(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/options/bacalhau.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package options
import (
"fmt"

"github.com/lilypad-tech/lilypad/pkg/executor/bacalhau"
"github.com/lilypad-tech/lilypad/v2/pkg/executor/bacalhau"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/options/job-creator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package options
import (
"fmt"

"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/jobcreator"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/v2/pkg/data"
"github.com/lilypad-tech/lilypad/v2/pkg/jobcreator"
"github.com/lilypad-tech/lilypad/v2/pkg/system"
"github.com/spf13/cobra"
)

Expand Down
Loading