Merge branch 'master' into buildspec-4.0

bvtujo · May 22, 2020 · 53f9355 · 53f9355
2 parents 173379b + d5a67eb
commit 53f9355
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/buildspec.yml b/buildspec.yml
@@ -35,7 +35,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"
       - |
@@ -55,7 +55,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

diff --git a/buildspec_integ.yml b/buildspec_integ.yml
@@ -4,12 +4,11 @@ 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:
+      - 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
+