mirror of
https://github.com/project-zot/zot.git
synced 2026-06-17 21:17:58 +08:00
chore: Enable Go jsonv2 experiment and update the trivy dependency (v0.67.2) (#3572)
It requires the encoding/json/jsontext package which is only available when the goexperiment.jsonv2 build tag is enabled. This was causing build constraint errors during tests and builds. Changes: - Add GOEXPERIMENT=jsonv2 to Makefile export and all go build/test commands that use env (since env creates a fresh environment) - Add GOEXPERIMENT=jsonv2 to GitHub workflows that use direct go commands (workflows using make inherit it from Makefile) Fix other dependabot alerts. Signed-off-by: Andrei Aaron <andreifdaaron@gmail.com>
This commit is contained in:
+10
-11
@@ -733,18 +733,17 @@ func Perf(
|
||||
|
||||
for range concurrency {
|
||||
// parallelize with clients
|
||||
wg.Go(
|
||||
func() {
|
||||
httpClient, err := getRandomClientIPs(auth, url, ips)
|
||||
if err != nil {
|
||||
fatalWithCleanup(err)
|
||||
}
|
||||
wg.Go(func() {
|
||||
httpClient, err := getRandomClientIPs(auth, url, ips)
|
||||
if err != nil {
|
||||
fatalWithCleanup(err)
|
||||
}
|
||||
|
||||
err = tconfig.tfunc(workdir, url, repo, requests/concurrency, tconfig, statsCh, httpClient, skipCleanup)
|
||||
if err != nil {
|
||||
fatalWithCleanup(err)
|
||||
}
|
||||
})
|
||||
err = tconfig.tfunc(workdir, url, repo, requests/concurrency, tconfig, statsCh, httpClient, skipCleanup)
|
||||
if err != nil {
|
||||
fatalWithCleanup(err)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
wg.Wait()
|
||||
|
||||
Reference in New Issue
Block a user