From 84cee82c634a2567c4714afb81805ac1b16fc736 Mon Sep 17 00:00:00 2001 From: Victoria Miltcheva Date: Mon, 16 Aug 2021 13:37:27 -0400 Subject: [PATCH 1/2] Login to GH and GHE to fix deploy --- .travis.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d14b7dfe..c2dd86ce6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,19 @@ language: python git: - depth: false + depth: false services: - docker deploy: -- provider: script - script: >- - set -e; make docker-build-images docker-test-images setup-trivy docker-quality-images deploy - on: - all_branches: true - # only build docker image and push once - condition: $TOXENV = py38 - # only deploy when pushing to gh repo - repo: IBM/detect-secrets + - provider: script + script: >- + set -e; make docker-build-images docker-test-images setup-trivy docker-quality-images deploy + on: + all_branches: true + # only build docker image and push once + condition: $TOXENV = py38 + # only deploy when pushing to gh repo + repo: IBM/detect-secrets matrix: include: @@ -23,12 +23,15 @@ matrix: python: 3.6.10 # We're targeting a specific patch version; if set to 3.6, the GitHub Travis build will use Python 3.6.7 and will fail due to a cryptography installation error - env: TOXENV=py37 python: 3.7 - dist: xenial # Required for Python >= 3.7 (travis-ci/travis-ci#9069) + dist: xenial # Required for Python >= 3.7 (travis-ci/travis-ci#9069) - env: TOXENV=py38 python: 3.8 - dist: xenial # Required for Python >= 3.7 (travis-ci/travis-ci#9069) + dist: xenial # Required for Python >= 3.7 (travis-ci/travis-ci#9069) # - env: TOXENV=pypy # python: pypy +before_install: + - echo -e "machine github.com\n login $GH_ACCESS_TOKEN" >> ~/.netrc # Login to GitHub + - echo -e "machine github.ibm.com\n login $GHE_ACCESS_TOKEN" >> ~/.netrc # Login to GitHub enterprise install: - pip install tox script: make test From a2e5843783230f37c1279c0d3d455b3c3ddf5d92 Mon Sep 17 00:00:00 2001 From: Victoria Miltcheva Date: Mon, 16 Aug 2021 13:42:03 -0400 Subject: [PATCH 2/2] capitalization --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c2dd86ce6..75515971f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ matrix: # python: pypy before_install: - echo -e "machine github.com\n login $GH_ACCESS_TOKEN" >> ~/.netrc # Login to GitHub - - echo -e "machine github.ibm.com\n login $GHE_ACCESS_TOKEN" >> ~/.netrc # Login to GitHub enterprise + - echo -e "machine github.ibm.com\n login $GHE_ACCESS_TOKEN" >> ~/.netrc # Login to GitHub Enterprise install: - pip install tox script: make test