diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 4a9c0d7..c8d1418 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -31,6 +31,9 @@ jobs: - python: '3.12' os: ubuntu-latest tox_env: 'build' + - python: '3.7' + os: ubuntu-22.04 + tox_env: ["py,codecov"] exclude: # macos-14 AKA macos-latest has switched to being an ARM runner, only supporting newer versions of Python # https://github.com/actions/setup-python/issues/825#issuecomment-2096792396 @@ -42,6 +45,8 @@ jobs: os: macos-latest - python: '3.10' os: macos-latest + - python: '3.7' + os: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/src/travis2docker/cli.py b/src/travis2docker/cli.py index 06fc8f4..2d0eb5b 100644 --- a/src/travis2docker/cli.py +++ b/src/travis2docker/cli.py @@ -42,11 +42,12 @@ def get_git_data(project, path, revision): def yml_read(yml_path): yml_path_expanded = expandvars(expanduser(yml_path)) + alt_yml_path_expanded = None if isdir(yml_path_expanded): yml_path_expanded = join(yml_path_expanded, '.travis.yml') alt_yml_path_expanded = join(yml_path_expanded, '.t2d.yml') if not isfile(yml_path_expanded): - if isfile(alt_yml_path_expanded): + if alt_yml_path_expanded and isfile(alt_yml_path_expanded): yml_path_expanded = alt_yml_path_expanded else: return