-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactored (reduced factorial languages combos) (#26)
* refactor * rename file * refacored * patch * might work * retrigger tests * i think it might work now
- Loading branch information
Showing
6 changed files
with
180 additions
and
128 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| package staging | ||
|
|
||
| import ( | ||
| "github.com/metacall/builder/pkg/env" | ||
| "github.com/moby/buildkit/client/llb" | ||
| ) | ||
|
|
||
| var languageMap = map[string]string{ | ||
| "base": "base", | ||
| "py": "python", | ||
| "rb": "ruby", | ||
| // "netcore": "netcore", | ||
| // "netcore2": "netcore2", | ||
| // "netcore5": "netcore5", | ||
| // "netcore7": "netcore7", | ||
| // "rapidjson": "rapidjson", | ||
| // "funchook": "funchook", | ||
| // "v8": "v8", | ||
| // "v8rep54": "v8rep54", | ||
| // "v8rep57": "v8rep57", | ||
| // "v8rep58": "v8rep58", | ||
| // "v8rep52": "v8rep52", | ||
| // "v8rep51": "v8rep51", | ||
| "node": "nodejs", | ||
| "ts": "typescript", | ||
| // "file": "file", | ||
| // "rpc": "rpc", | ||
| "wasm": "wasm", | ||
| "java": "java", | ||
| "c": "c", | ||
| "cob": "cobol", | ||
| "go": "go", | ||
| "rs": "rust", | ||
| // "backtrace" : "backtrace", | ||
| // "sandbox" : "sandbox", | ||
| } | ||
|
|
||
| func DepsBase(base llb.State, branch string, args []string) map[string]llb.State { | ||
| cmdArgs, err := validateArgs(args) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
|
|
||
| m := make(map[string]llb.State, len(cmdArgs)) | ||
|
|
||
| envBase := env.New(base). | ||
| DepsEnv(). | ||
| Base(). | ||
| MetaCallClone(branch) | ||
|
|
||
| if len(cmdArgs) == 0 { | ||
| foo := envBase | ||
| depsLang := foo.MetacallEnvBase("").Root() | ||
| m["emptyBase"] = depsLang | ||
|
|
||
| } else { | ||
| for _, arg := range cmdArgs { | ||
| foo := envBase | ||
| depsLang := foo.MetacallEnvBase(arg).Root() | ||
| m[arg] = depsLang | ||
| } | ||
| } | ||
|
|
||
| return m | ||
| } | ||
|
|
||
| func DevBase(base llb.State, branch string, args []string) map[string]llb.State { | ||
|
|
||
| langMapDev := DepsBase(base, branch, args) | ||
|
|
||
| if value, exists := langMapDev["emptyBase"]; exists { | ||
| langDev := env.New(value). | ||
| DevEnv(). | ||
| MetaCallConfigure(""). | ||
| MetaCallBuild(""). | ||
| Root() | ||
|
|
||
| langMapDev["emptyBase"] = langDev | ||
|
|
||
| } else { | ||
| for lang, langDeps := range langMapDev { | ||
| langDev := env.New(langDeps). | ||
| DevEnv(). | ||
| MetaCallConfigure(lang). | ||
| MetaCallBuild(lang). | ||
| Root() | ||
|
|
||
| langMapDev[lang] = langDev | ||
| } | ||
| } | ||
|
|
||
| return langMapDev | ||
| } | ||
|
|
||
| func RuntimeBase(base llb.State, branch string, args []string) map[string]llb.State { | ||
|
|
||
| langMapDev := DevBase(base, branch, args) | ||
| emptyMapDev := DevBase(base, branch, []string{}) | ||
|
|
||
| // Empty base to take diff from | ||
| emptyDevBase := emptyMapDev["emptyBase"] | ||
| emptyDevBase = RemoveBuild(emptyDevBase) | ||
|
|
||
| // Runtime base | ||
| runtimeBase := env.New(base). | ||
| RuntimeEnv(). | ||
| Base(). | ||
| MetaCallClone(branch) | ||
|
|
||
| for lang, langDev := range langMapDev { | ||
| foo := runtimeBase | ||
| langRuntimeBase := foo.MetacallRuntime(lang).Root() | ||
|
|
||
| diffed := llb.Diff(emptyDevBase, langDev) | ||
| langRuntime := llb.Merge([]llb.State{langRuntimeBase, diffed}) | ||
| langMapDev[lang] = langRuntime | ||
| } | ||
|
|
||
| return langMapDev | ||
| } | ||
|
|
||
| func AddCli(src llb.State, dst llb.State) llb.State { | ||
| return dst.With(copyFrom(src, "/usr/local/bin/metacallcli*", "/usr/local/bin/metacallcli")) | ||
| } | ||
|
|
||
| func RemoveBuild(state llb.State) llb.State { | ||
| // return state | ||
| return state.File(llb.Rm("/usr/local/metacall")) | ||
| } | ||
|
|
||
| func MergeStates(individualLangStates map[string]llb.State) llb.State { | ||
| states := []llb.State{} | ||
| for _, state := range individualLangStates { | ||
| states = append(states, state) | ||
| } | ||
| return llb.Merge(states) | ||
| } |