Merge pull request #12 from lorengordon/patch-deploy

Patches deploy so releases work
plus3it · Sep 28, 2018 · d22c5a5 · d22c5a5
2 parents 667da3f + 1db289c
commit d22c5a5
Showing 1 changed file with 20 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,52 +1,42 @@
 language: bash
 
-sudo: false
-
 env:
   global:
     - AWS_DEFAULT_REGION="us-east-1"
     - REPO="${TRAVIS_REPO_SLUG#*/}"
     - OWNER=plus3it
     - DEPLOY_SLUG=$OWNER/$REPO
 
-before_install:
-  - TERRAFORM_VERSION=$(curl -sSL https://checkpoint-api.hashicorp.com/v1/check/terraform | jq -r -M '.current_version')
-  - TERRAFORM_URL="https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
-  - echo "TERRAFORM_URL=${TERRAFORM_URL}"
-  - curl -sSL -o terraform.zip "$TERRAFORM_URL"
-  - unzip terraform.zip && rm -f terraform.zip
-  - chmod +x terraform
-  - mkdir -p $HOME/bin
-  - export PATH=$PATH:$HOME/bin
-  - mv terraform $HOME/bin
-  - terraform --version
-
-before_script:
-  - echo $JOB
-  - echo $TESTCOMMAND
-
-script:
-  - bash -c "$TESTCOMMAND"
-
 jobs:
   include:
     - stage: test
       env:
         - JOB="Terraform Format Check"
-        - TESTCOMMAND="terraform fmt -check=true"
+      before_install:
+        - TERRAFORM_VERSION=$(curl -sSL https://checkpoint-api.hashicorp.com/v1/check/terraform | jq -r -M '.current_version')
+        - TERRAFORM_URL="https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
+        - echo "TERRAFORM_URL=${TERRAFORM_URL}"
+        - curl -sSL -o terraform.zip "$TERRAFORM_URL"
+        - unzip terraform.zip && rm -f terraform.zip
+        - chmod +x terraform
+        - mkdir -p $HOME/bin
+        - export PATH=$PATH:$HOME/bin
+        - mv terraform $HOME/bin
+        - terraform --version
+      script:
+        - terraform fmt -check=true
     - stage: deploy
-      if: branch = master AND type = push AND repo = env(DEPLOY_SLUG)
       env:
         - JOB="Deploy to GitHub Releases"
         - PRIOR_VERSION=$(git describe --abbrev=0 --tags)
         - RELEASE_VERSION=$(grep current_version $TRAVIS_BUILD_DIR/.bumpversion.cfg | sed 's/^.*= //')
         - RELEASE_BODY="* [$REPO v$RELEASE_VERSION changes](https://github.com/$OWNER/$REPO/compare/$PRIOR_VERSION...$RELEASE_VERSION)"
-      before_script:
+      script:
+        - skip
+      before_deploy:
         - echo PRIOR_VERSION=$PRIOR_VERSION
         - echo RELEASE_VERSION=$RELEASE_VERSION
         - echo RELEASE_BODY=$RELEASE_BODY
-      script:
-        - test "$PRIOR_VERSION" = "$RELEASE_VERSION" && travis_terminate || echo "Deploying new version..."
       deploy:
         provider: releases
         name: $RELEASE_VERSION
@@ -55,3 +45,7 @@ jobs:
         draft: false
         api_key:
           secure: ZVwUe5hN5k2gaOzIpWzC6F/go2gemRRzIe3LtMmuoCFWbO20OulJw9kVuq5moqkZuhMqoQ2ep9SE45QhxRVYXZPd1d2E4sYhES/0XPGL91ssl87xFEkHn1F5uYPLNXSp96ALG9RbJbiqdvHiMuE4bn94AJofb9+63Syt7LnbQCMNs14M6c8xtPaUcngTFhimOrQTNmMlkRpjrPEJ8/jE4eQy2JejqpN2jYLRwli7HlCONwLHCMMkNnmPU7W5VihkcJSu016JmsJ/2YGCGA+SGHXJCrGiOoGyLLMSXusMS03D8KXVxbiWgP6apQLn8YlrAuirLg+s3+x1ECPFWR0grCRydDtdCausl1HfcN4+rWm154nYGi900ypd+aWcYQMSarsSmxCpCn5Nngz6IgJwJALlqCbqmLpg8WJXKxfOeNzI19Wsn/f0Vr3jkqTvR7KqTLpEvMKs11PFxb0z9LKCpkexnIadNl7qRR8lY+ilB0+e2ZMlsmuoDGCGdLD6oLoevH0nStmbNzMNMlZ+ClSNPAg74Em0a8vo1rCNhZPG/H9X0jpKlbn1NDXdDvggewHqO7La+E7+K3dxD5d06pHpfsS6vBrrJJVwrRp9eLvKgAF/3Bebc9eVcOBQdhOA+A6/6LpQ7F4l3rNBzJRY0YDbbU+WFQf4z2xmqDgIOnivK18=
+        on:
+          branch: master
+          repo: $DEPLOY_SLUG
+          condition: '"$PRIOR_VERSION" != "$RELEASE_VERSION"'