Skip to content

Commit

Permalink
Merge pull request #506 from jantman/travisci-com
Browse files Browse the repository at this point in the history
Move CI builds from travis-ci.org to travis-ci.com
  • Loading branch information
jantman committed Dec 1, 2020
2 parents e7b6223 + 2380a1f commit 66d346a
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,4 @@ results/
.release_position.json
dev/terraform.tfstate
man/
share/
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Changelog
* This release **disables Trusted Advisor by default outside China and GovCloud**, as it provides no additional information outside of these regions/partitions.
* If you are running in China or GovCloud and have issues with awslimitchecker retrieving information from Trusted Advisor, please `open an issue <https://github.com/jantman/awslimitchecker/issues>`__.
* My current intent is to leave Trusted Advisor support in this state until Service Quotas is available in China and GovCloud, at which point I plan on completely removing all Trusted Advisor support.
* Migrate CI builds from travis-ci.org to travis-ci.com.

.. _changelog.9_0_0:

Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ awslimitchecker

Master:

.. image:: https://secure.travis-ci.org/jantman/awslimitchecker.png?branch=master
:target: http://travis-ci.org/jantman/awslimitchecker
.. image:: https://api.travis-ci.com/jantman/awslimitchecker.svg?branch=master
:target: http://travis-ci.com/jantman/awslimitchecker
:alt: travis-ci for master branch

.. image:: https://codecov.io/github/jantman/awslimitchecker/coverage.svg?branch=master
Expand All @@ -41,8 +41,8 @@ Master:

Develop:

.. image:: https://secure.travis-ci.org/jantman/awslimitchecker.png?branch=develop
:target: http://travis-ci.org/jantman/awslimitchecker
.. image:: https://api.travis-ci.com/jantman/awslimitchecker.svg?branch=develop
:target: http://travis-ci.com/jantman/awslimitchecker
:alt: travis-ci for develop branch

.. image:: https://codecov.io/github/jantman/awslimitchecker/coverage.svg?branch=develop
Expand Down
10 changes: 5 additions & 5 deletions dev/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def run(self):
'and then re-run.' % (build.number, build.id))
logger.info('OK, Travis build passed.')
logger.info(
'Build URL: <https://travis-ci.org/jantman/awslimitchecker/'
'Build URL: <https://travis-ci.com/jantman/awslimitchecker/'
'builds/%s>', build.id
)
if not prompt_user(
Expand Down Expand Up @@ -315,13 +315,13 @@ def wait_for_travis(self, pr_num):
pr = self._gh._repo.pull_request(pr_num)
headsha = pr.head.sha
while True:
for s in self._gh._repo.statuses(sha=headsha):
if s.context == 'continuous-integration/travis-ci/pr':
for s in self._gh._repo.commit(headsha).check_runs():
if s.name == 'Travis CI - Pull Request':
logger.info(
'Last TravisCI PR status: %s <%s> (at %s)',
s.state, s.target_url, s.updated_at
s.conclusion, s.html_url, s.completed_at
)
if s.state == 'success':
if s.conclusion == 'success':
return True
logger.debug('No successful TravisCI PR build; trying again in 15s')
sleep(15)
Expand Down
4 changes: 2 additions & 2 deletions dev/release_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

try:
from travispy import TravisPy
from travispy.travispy import PUBLIC
from travispy.travispy import PRIVATE
except ImportError:
raise SystemExit(
"ERROR: TravisPy not installed. Please run 'pip install TravisPy'"
Expand Down Expand Up @@ -98,7 +98,7 @@ def __init__(self):
'Please export your GitHub PAT as the "GITHUB_TOKEN" env var'
)
logger.debug('Connecting to TravisCI API...')
self._travis = TravisPy.github_auth(token)
self._travis = TravisPy.github_auth(token, uri=PRIVATE)

def commit_latest_build_status(self, commit):
"""
Expand Down
2 changes: 1 addition & 1 deletion dev/requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ tox==2.7.0
twine
webhook2lambda2sqs
wheel
github3.py==1.0.0a4
github3.py==1.3.0

0 comments on commit 66d346a

Please sign in to comment.