Skip to content

Commit 011fb4a

Browse files
feat: use version constraints on targets rather than "exclude_targets"
Simplifies greatly the definitions in `targets.json`. This is implemented in a backward compatible way to that API clients don't have to change anything. Please note that when loading `targets.json`, `exclude_targets` attributes are overwritten with a new list computed with the new version constraints.
1 parent 0fca7bd commit 011fb4a

File tree

8 files changed

+273
-203
lines changed

8 files changed

+273
-203
lines changed

artifactory/artifactory_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ import (
2828
func init() {
2929
log.SetOutput(os.Stdout)
3030
log.SetLevel(log.DebugLevel)
31-
err := targets.ReadTargetsDefFromBytes([]byte(targetsJSON))
31+
defs, err := targets.ReadTargetsDefFromBytes([]byte(targetsJSON))
3232
if err != nil {
3333
panic(err)
3434
}
35+
targets.SetTargets(defs)
3536
request = artifactory.NewBuildRequestWithParams(commitRef, target, flags)
3637
}
3738

cmd/ebuild/run/cmd.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@ func (s *serverRunner) runAPI(cmd *cobra.Command, args []string) {
4040
fmt.Printf("failed to migrate database: %s", err)
4141
os.Exit(1)
4242
}
43-
if err := targets.ReadTargetsDef("./targets.json"); err != nil {
43+
if defs, err := targets.ReadTargetsDef("./targets.json"); err != nil {
4444
fmt.Printf("failed to read targets: %s", err)
4545
os.Exit(1)
46+
} else {
47+
targets.SetTargets(defs)
4648
}
4749
go targets.Updater(time.Minute * 5)
4850
art, err := artifactory.NewFromConfig(s.ctx, s.opts)

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module github.com/edgetx/cloudbuild
33
go 1.24.1
44

55
require (
6+
github.com/Masterminds/semver/v3 v3.4.0
67
github.com/aws/aws-sdk-go-v2 v1.18.0
78
github.com/aws/aws-sdk-go-v2/config v1.18.23
89
github.com/aws/aws-sdk-go-v2/credentials v1.13.22

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f
3838
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
3939
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
4040
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
41+
github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
42+
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
4143
github.com/aws/aws-sdk-go-v2 v1.18.0 h1:882kkTpSFhdgYRKVZ/VCgf7sd0ru57p2JCxz4/oN5RY=
4244
github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
4345
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs=

0 commit comments

Comments
 (0)