Skip to content

Commit

Permalink
Merge pull request #130 from hootsuite/ensure-http
Browse files Browse the repository at this point in the history
Ensure we're using the http protocol for ngrok
  • Loading branch information
lkysow authored Aug 17, 2017
2 parents 2e0e970 + dd7592b commit 2822b3a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
command: cd "${CIRCLE_WORKING_DIRECTORY}/e2e" && ./atlantis server --gh-user="$GITHUB_USERNAME" --gh-token="$GITHUB_PASSWORD" --data-dir="/tmp" --log-level="debug" &> /tmp/atlantis-server.log
background: true
- run: sleep 2
- run:
- run:
name: Starting ngrok
command: cd "${CIRCLE_WORKING_DIRECTORY}/e2e" && ./ngrok http 4141 > /tmp/ngrok.log
background: true
- run: sleep 2
- run: echo 'export ATLANTIS_URL=$(curl -s 'http://localhost:4040/api/tunnels' | jq -r '.tunnels[1].public_url')' >> $BASH_ENV
- run: echo "export ATLANTIS_URL=$(curl -s 'http://localhost:4040/api/tunnels' | jq -r '.tunnels[] | select(.proto=="http") | .public_url')" >> $BASH_ENV
- run:
name: Run e2e tests
command: make end-to-end-tests
Expand All @@ -53,4 +53,4 @@ jobs:
docker tag hootsuite/atlantis:latest hootsuite/atlantis:$TAG
docker push hootsuite/atlantis:$TAG
done
fi
fi

0 comments on commit 2822b3a

Please sign in to comment.