Signed-off-by: dawn dawn@tangled.org
+87
-2
Diff
Round #5
+16
spindle/engine_microvm_linux.go
+16
spindle/engine_microvm_linux.go
···
1
+
//go:build linux
2
+
3
+
package spindle
4
+
5
+
import (
6
+
"context"
7
+
8
+
"tangled.org/core/spindle/config"
9
+
"tangled.org/core/spindle/db"
10
+
"tangled.org/core/spindle/engines/microvm"
11
+
"tangled.org/core/spindle/models"
12
+
)
13
+
14
+
func newMicrovmEngine(ctx context.Context, cfg *config.Config, d *db.DB) (models.Engine, error) {
15
+
return microvm.New(ctx, cfg, d)
16
+
}
+16
spindle/engine_microvm_other.go
+16
spindle/engine_microvm_other.go
···
1
+
//go:build !linux
2
+
3
+
package spindle
4
+
5
+
import (
6
+
"context"
7
+
"fmt"
8
+
9
+
"tangled.org/core/spindle/config"
10
+
"tangled.org/core/spindle/db"
11
+
"tangled.org/core/spindle/models"
12
+
)
13
+
14
+
func newMicrovmEngine(context.Context, *config.Config, *db.DB) (models.Engine, error) {
15
+
return nil, fmt.Errorf("microvm engine is only supported on Linux")
16
+
}
+2
spindle/engines/microvm/agent.go
+2
spindle/engines/microvm/agent.go
+2
spindle/engines/microvm/args.go
+2
spindle/engines/microvm/args.go
+2
spindle/engines/microvm/budget.go
+2
spindle/engines/microvm/budget.go
+2
spindle/engines/microvm/cgroup.go
+2
spindle/engines/microvm/cgroup.go
+2
spindle/engines/microvm/cgroup_oom_test.go
+2
spindle/engines/microvm/cgroup_oom_test.go
+2
spindle/engines/microvm/cgroup_test.go
+2
spindle/engines/microvm/cgroup_test.go
+2
spindle/engines/microvm/dns_proxy.go
+2
spindle/engines/microvm/dns_proxy.go
+2
spindle/engines/microvm/dns_proxy_test.go
+2
spindle/engines/microvm/dns_proxy_test.go
+2
spindle/engines/microvm/engine.go
+2
spindle/engines/microvm/engine.go
+2
spindle/engines/microvm/engine_test.go
+2
spindle/engines/microvm/engine_test.go
+2
spindle/engines/microvm/image.go
+2
spindle/engines/microvm/image.go
+2
spindle/engines/microvm/image_test.go
+2
spindle/engines/microvm/image_test.go
+2
spindle/engines/microvm/models.go
+2
spindle/engines/microvm/models.go
+2
spindle/engines/microvm/models_test.go
+2
spindle/engines/microvm/models_test.go
+2
spindle/engines/microvm/networking.go
+2
spindle/engines/microvm/networking.go
+2
spindle/engines/microvm/nixos_toplevel_cache.go
+2
spindle/engines/microvm/nixos_toplevel_cache.go
+2
spindle/engines/microvm/qemu.go
+2
spindle/engines/microvm/qemu.go
+2
spindle/engines/microvm/read_cache_proxy.go
+2
spindle/engines/microvm/read_cache_proxy.go
+2
spindle/engines/microvm/read_cache_proxy_test.go
+2
spindle/engines/microvm/read_cache_proxy_test.go
+2
spindle/engines/microvm/runner.go
+2
spindle/engines/microvm/runner.go
+2
spindle/engines/microvm/upload_cache_http.go
+2
spindle/engines/microvm/upload_cache_http.go
+2
spindle/engines/microvm/upload_cache_narinfo.go
+2
spindle/engines/microvm/upload_cache_narinfo.go
+2
spindle/engines/microvm/upload_cache_nix_store.go
+2
spindle/engines/microvm/upload_cache_nix_store.go
+2
spindle/engines/microvm/upload_cache_nix_store_test.go
+2
spindle/engines/microvm/upload_cache_nix_store_test.go
+2
spindle/engines/microvm/upload_cache_proxy.go
+2
spindle/engines/microvm/upload_cache_proxy.go
+2
spindle/engines/microvm/upload_cache_proxy_test.go
+2
spindle/engines/microvm/upload_cache_proxy_test.go
+1
-2
spindle/server.go
+1
-2
spindle/server.go
···
36
36
"tangled.org/core/spindle/db"
37
37
"tangled.org/core/spindle/engine"
38
38
"tangled.org/core/spindle/engines/dummy"
39
-
"tangled.org/core/spindle/engines/microvm"
40
39
"tangled.org/core/spindle/engines/nixery"
41
40
"tangled.org/core/spindle/git"
42
41
"tangled.org/core/spindle/models"
···
352
351
return err
353
352
}
354
353
355
-
microvmEng, err := microvm.New(ctx, cfg, d)
354
+
microvmEng, err := newMicrovmEngine(ctx, cfg, d)
356
355
if err != nil {
357
356
return err
358
357
}
History
9 rounds
0 comments
1 commit
Expand
Collapse
spindle/engines/microvm: only build on linux
Signed-off-by: dawn <dawn@tangled.org>
3/3 success
Expand
Collapse
Expand 0 comments
1 commit
Expand
Collapse
spindle/engines/microvm: only build on linux
Signed-off-by: dawn <dawn@tangled.org>
3/3 success
Expand
Collapse
Expand 0 comments
1 commit
Expand
Collapse
spindle/engines/microvm: only build on linux
Signed-off-by: dawn <dawn@tangled.org>
2/3 success, 1/3 failed
Expand
Collapse
Expand 0 comments
1 commit
Expand
Collapse
spindle/engines/microvm: only build on linux
Signed-off-by: dawn <dawn@tangled.org>
3/3 success
Expand
Collapse
Expand 0 comments
1 commit
Expand
Collapse
spindle/engines/microvm: only build on linux
Signed-off-by: dawn <dawn@tangled.org>
3/3 success
Expand
Collapse
Expand 0 comments
1 commit
Expand
Collapse
spindle/engines/microvm: only build on linux
Signed-off-by: dawn <dawn@tangled.org>
3/3 success
Expand
Collapse
Expand 0 comments
1 commit
Expand
Collapse
spindle/engines/microvm: only build on linux
Signed-off-by: dawn <dawn@tangled.org>
3/3 success
Expand
Collapse
Expand 0 comments
1 commit
Expand
Collapse
spindle/engines/microvm: only build on linux
Signed-off-by: dawn <dawn@tangled.org>
3/3 success
Expand
Collapse
Expand 0 comments
1 commit
Expand
Collapse
spindle/engines/microvm: only build on linux
Signed-off-by: dawn <dawn@tangled.org>