Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.17](backport #38366) Disable buildvcs within docker #38379

Merged
merged 1 commit into from
Mar 19, 2024
Merged

[7.17](backport #38366) Disable buildvcs within docker #38379

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev-tools/mage/crossbuild.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

"github.com/magefile/mage/mg"
"github.com/magefile/mage/sh"
"github.com/pkg/errors"

Check failure on line 33 in dev-tools/mage/crossbuild.go

View workflow job for this annotation

GitHub Actions / lint (windows) 

import of package `github.com/pkg/errors` is blocked because the module is in the blocked modules list. `errors` and `fmt` are recommended modules. This package is deprecated, use `fmt.Errorf` with `%!w(MISSING)` instead. (gomodguard)

Check failure on line 33 in dev-tools/mage/crossbuild.go

View workflow job for this annotation

GitHub Actions / lint (darwin) 

import of package `github.com/pkg/errors` is blocked because the module is in the blocked modules list. `errors` and `fmt` are recommended modules. This package is deprecated, use `fmt.Errorf` with `%!w(MISSING)` instead. (gomodguard)

"github.com/elastic/beats/v7/dev-tools/mage/gotool"
"github.com/elastic/beats/v7/libbeat/common/file"
Expand All @@ -43,7 +43,7 @@
// See NewPlatformList for details about platform filtering expressions.
var Platforms = BuildPlatforms.Defaults()

// Types is the list of package types

Check failure on line 46 in dev-tools/mage/crossbuild.go

View workflow job for this annotation

GitHub Actions / lint (windows) 

ST1022: comment on exported var SelectedPackageTypes should be of the form "SelectedPackageTypes ..." (stylecheck)

Check failure on line 46 in dev-tools/mage/crossbuild.go

View workflow job for this annotation

GitHub Actions / lint (darwin) 

ST1022: comment on exported var SelectedPackageTypes should be of the form "SelectedPackageTypes ..." (stylecheck)
var SelectedPackageTypes []PackageType

func init() {
Expand Down Expand Up @@ -302,7 +302,7 @@

args = append(args,
"--rm",
"--env", "GOFLAGS=-mod=readonly",
"--env", "GOFLAGS=-mod=readonly -buildvcs=false",
"--env", "MAGEFILE_VERBOSE="+verbose,
"--env", "MAGEFILE_TIMEOUT="+EnvOr("MAGEFILE_TIMEOUT", ""),
"--env", fmt.Sprintf("SNAPSHOT=%v", Snapshot),
Expand Down Expand Up @@ -336,7 +336,7 @@
start := time.Now()
numFixed := 0
defer func() {
log.Printf("chown took: %v, changed %d files", time.Now().Sub(start), numFixed)

Check failure on line 339 in dev-tools/mage/crossbuild.go

View workflow job for this annotation

GitHub Actions / lint (windows) 

S1012: should use `time.Since` instead of `time.Now().Sub` (gosimple)

Check failure on line 339 in dev-tools/mage/crossbuild.go

View workflow job for this annotation

GitHub Actions / lint (darwin) 

S1012: should use `time.Since` instead of `time.Now().Sub` (gosimple)
}()

return filepath.Walk(path, func(name string, info os.FileInfo, err error) error {
Expand Down
Loading