Skip to content

Commit 5ab7733

Browse files
author
Tony Worm
committed
(human) some improvements in multi-arch auto-detect, still not working completely
1 parent 9b1b67e commit 5ab7733

File tree

6 files changed

+26
-11
lines changed

6 files changed

+26
-11
lines changed

.veg/containers.cue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import (
88
"github.com/hofstadter-io/hof/schemas/env"
99
)
1010

11-
_packs: packs
11+
_packs: packs & {
12+
"flags": flags
13+
}
1214

1315
let root = self
1416

catalogs/env/packs/index.cue

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ import (
77
itool "github.com/hofstadter-io/hof/catalogs/env/packs/tool"
88
)
99

10-
containers: icontainers
11-
databases: idatabases
12-
lang: ilang
13-
tool: itool
10+
flags: {
11+
goos: string
12+
arch: string
13+
}
14+
15+
containers: icontainers & { "flags": flags }
16+
databases: idatabases & { "flags": flags }
17+
lang: ilang & { "flags": flags }
18+
tool: itool & { "flags": flags }

catalogs/env/packs/lang/cue.cue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
)
88

99
cue: {
10-
#ver: string | *"0.15.3"
10+
#ver: string | *"0.15.4"
1111

12-
#goos: *"linux" | "darwin"
13-
#goarch: *"arm64" | "amd64"
12+
#goos: string | *flags.goos
13+
#goarch: string | *flags.arch
1414

1515
caches: {
1616
cueMods: env.Volume & {

catalogs/env/packs/lang/flags.cue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package lang
2+
3+
flags: {
4+
goos: *"linux" | "darwin"
5+
arch: "arm64" | *"amd64"
6+
}

catalogs/env/packs/lang/go.cue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
go: {
1212
#ver: string | *"1.25.5"
1313

14-
#goos: *"linux" | "darwin"
15-
#goarch: *"arm64" | "amd64"
14+
#goos: string | *flags.goos
15+
#goarch: string | *flags.arch
1616

1717
envSets: {
1818
default: [

catalogs/env/packs/lang/node.cue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ import (
66

77
node: {
88
#ver: string | *"24.12.0"
9-
#arch: *"arm64" | "amd64"
9+
#arch: "arm64" | *"x64"
10+
// #arch: string | *flags.arch
11+
1012

1113
caches: {
1214
nodeMods: env.Volume & {

0 commit comments

Comments
 (0)