From 6b7c861968ba94380f9c17ddc3ac2696bbdac0bd Mon Sep 17 00:00:00 2001 From: Austin Ely Date: Thu, 21 May 2020 13:31:54 -0700 Subject: [PATCH 1/5] update to match canary bs --- buildspec_integ.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/buildspec_integ.yml b/buildspec_integ.yml index 935213569..0e26e5749 100644 --- a/buildspec_integ.yml +++ b/buildspec_integ.yml @@ -4,11 +4,6 @@ phases: install: runtime-versions: golang: 1.13 - pre_build: - commands: - - mkdir -p /go/src/github.com/aws/amazon-ecs-cli - - cp -R . /go/src/github.com/aws/amazon-ecs-cli/ - - cd /go/src/github.com/aws/amazon-ecs-cli/ build: commands: - make integ-test From c60021fb3543141c4191e8a7374a6b269a91c324 Mon Sep 17 00:00:00 2001 From: Austin Ely Date: Thu, 21 May 2020 15:06:07 -0700 Subject: [PATCH 2/5] Update buildspec_integ.yml --- buildspec_integ.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/buildspec_integ.yml b/buildspec_integ.yml index 0e26e5749..0ce880f3f 100644 --- a/buildspec_integ.yml +++ b/buildspec_integ.yml @@ -6,5 +6,6 @@ phases: golang: 1.13 build: commands: + - go get ./ecs-cli/modules/... - make integ-test - ./bin/local/ecs-cli.test From 2bbc1f40fa2bc8e450a04ad8dc1168336895640e Mon Sep 17 00:00:00 2001 From: Austin Ely Date: Thu, 21 May 2020 15:12:03 -0700 Subject: [PATCH 3/5] Update buildspec_integ.yml --- buildspec_integ.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/buildspec_integ.yml b/buildspec_integ.yml index 0ce880f3f..ef98e44c5 100644 --- a/buildspec_integ.yml +++ b/buildspec_integ.yml @@ -6,6 +6,9 @@ phases: golang: 1.13 build: commands: + - mkdir -p /go/src/github.com/aws/amazon-ecs-cli + - cp -r . /go/src/github.com/aws/amazon-ecs-cli/ - go get ./ecs-cli/modules/... - make integ-test - ./bin/local/ecs-cli.test + From 583ffdafffdc8182fd08c374f52b3cafda95cfda Mon Sep 17 00:00:00 2001 From: Austin Ely Date: Thu, 21 May 2020 15:19:46 -0700 Subject: [PATCH 4/5] Update buildspec_integ.yml --- buildspec_integ.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildspec_integ.yml b/buildspec_integ.yml index ef98e44c5..e7794ed8a 100644 --- a/buildspec_integ.yml +++ b/buildspec_integ.yml @@ -6,8 +6,8 @@ phases: golang: 1.13 build: commands: - - mkdir -p /go/src/github.com/aws/amazon-ecs-cli - - cp -r . /go/src/github.com/aws/amazon-ecs-cli/ + - mkdir -p /go/1.13.8/src/github.com/aws/amazon-ecs-cli + - cp -r . /go/1.13.8/src/github.com/aws/amazon-ecs-cli/ - go get ./ecs-cli/modules/... - make integ-test - ./bin/local/ecs-cli.test From d5a67eb160c25a11b5a785c987db0c846769a61e Mon Sep 17 00:00:00 2001 From: Austin Ely Date: Thu, 21 May 2020 15:21:32 -0700 Subject: [PATCH 5/5] Update buildspec.yml --- buildspec.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/buildspec.yml b/buildspec.yml index c643f4d3b..d0d5ecce3 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -11,17 +11,17 @@ phases: # so we copy all the source code to the appropriate location before # invoking any go command - ls -lah - - mkdir -p /go/src/github.com/aws/amazon-ecs-cli - - cp -R . /go/src/github.com/aws/amazon-ecs-cli/ + - mkdir -p /go/1.13.8/src/github.com/aws/amazon-ecs-cli + - cp -R . /go/1.13.8/src/github.com/aws/amazon-ecs-cli/ - | env -i PATH=$PATH GOPATH=`go env GOPATH` GOROOT=`go env GOROOT` GOCACHE=`go env GOCACHE` \ go test -race -v -cover github.com/aws/amazon-ecs-cli/ecs-cli/modules/... # make a copy of the version.go because `go run gen/version-gen.go` will # modify it. - - cp /go/src/github.com/aws/amazon-ecs-cli/ecs-cli/modules/version/version.go /go/src/github.com/aws/amazon-ecs-cli/ecs-cli/modules/version/_version.go + - cp /go/1.13.8/src/github.com/aws/amazon-ecs-cli/ecs-cli/modules/version/version.go /go/1.13.8/src/github.com/aws/amazon-ecs-cli/ecs-cli/modules/version/_version.go # need to cd into the version package because version-gen.go assumes the relative # location of the VERSION file. - - cd /go/src/github.com/aws/amazon-ecs-cli/ecs-cli/modules/version/ + - cd /go/1.13.8/src/github.com/aws/amazon-ecs-cli/ecs-cli/modules/version/ # since we are running the go program inside a Linux container, has to hardcode # the GOOS and GOARCH correspondinly regardless of what the host OS is. - GOOS=linux GOARCH=amd64 ECS_RELEASE=cleanbuild go run gen/version-gen.go @@ -36,7 +36,7 @@ phases: - GIT_COMMIT_ID=`git rev-parse HEAD` - echo "GIT_COMMIT_ID=$GIT_COMMIT_ID" # TODO: Get rid of the VERSION file after we fully switch to the new CI/CD - - CHECKED_IN_VERSION=`cat /go/src/github.com/aws/amazon-ecs-cli/VERSION` + - CHECKED_IN_VERSION=`cat /go/1.13.8/src/github.com/aws/amazon-ecs-cli/VERSION` - echo "VERSION_FILE=$CHECKED_IN_VERSION" - echo "GOPATH=$GOPATH" - | @@ -56,7 +56,7 @@ phases: post_build: commands: # restore the version file - - mv /go/src/github.com/aws/amazon-ecs-cli/ecs-cli/modules/version/_version.go /go/src/github.com/aws/amazon-ecs-cli/ecs-cli/modules/version/version.go + - mv /go/1.13.8/src/github.com/aws/amazon-ecs-cli/ecs-cli/modules/version/_version.go /go/1.13.8/src/github.com/aws/amazon-ecs-cli/ecs-cli/modules/version/version.go - echo "Creating latest artifacts..." - cp aws/amazon-ecs-cli/ecs-cli-windows-amd64-$VERSION.exe aws/amazon-ecs-cli/ecs-cli-windows-amd64-latest.exe - cp aws/amazon-ecs-cli/ecs-cli-linux-amd64-$VERSION aws/amazon-ecs-cli/ecs-cli-linux-amd64-latest @@ -70,4 +70,4 @@ phases: - echo "aws/amazon-ecs-cli/ecs-cli-darwin-amd64-latest" >> $MANIFESTFILE artifacts: files: - - '**/*' \ No newline at end of file + - '**/*'