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.

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

Merge #104 from dev #105

Merged
merged 2 commits into from Jan 20, 2023
Merged

Merge #104 from dev #105

merged 2 commits into from Jan 20, 2023

Conversation

SreeeS
Copy link
Contributor

@SreeeS SreeeS commented Jan 20, 2023

Summary

Merge from dev to master branch

Make release is failing on amazon-ecs-agent when we update the submodules.

The Error message is:

GOOS=linux CGO_ENABLED=0 go build -installsuffix cgo -a -ldflags "\
     -X github.com/aws/amazon-ecs-cni-plugins/pkg/version.GitShortHash=a04bd6ec \
     -X github.com/aws/amazon-ecs-cni-plugins/pkg/version.GitPorcelain=0 \
     -X github.com/aws/amazon-ecs-cni-plugins/pkg/version.Version=2020.09.0 -s" \
     -o /go/src/github.com/aws/amazon-ecs-cni-plugins/bin/plugins/ecs-eni github.com/aws/amazon-ecs-cni-plugins/plugins/eni
error obtaining VCS status: exit status 128
	Use -buildvcs=false to disable VCS stamping.
make: *** [Makefile:40: bin/plugins/ecs-eni] Error 1
make: *** [build-ecs-cni-plugins] Error 2

This change is to include -buildvcs=false flag to the go build in Make file.

This error occurred after we updated the amazon-ecs-cni-plugins sub module in amazon-ecs-agent to pull the latest commit due to this change in golang: golang/go#37475

Implementation details

Added -buildvcs=false flag in Make file.
-buildvcs=false excludes version control information when golang version is >= 1.18.

Testing

make unit-test
make release on ecs-agent repo for go version 1.18.8 and 1.15

New tests cover the changes: no

Description for the changelog

bug-Fixed failed make release on ecs-agent repo

Licensing

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@SreeeS SreeeS merged commit 13a9b8d into master Jan 20, 2023
fierlion added a commit that referenced this pull request Feb 16, 2023
This reverts commit 13a9b8d, reversing
changes made to a04bd6e.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants