Skip to content

Commit

Permalink
squashme: minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
olevski committed Apr 4, 2022
1 parent 3f5194c commit 9d51b9b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
16 changes: 6 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,11 @@ name: CI

on: [push]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v1
with:
Expand All @@ -26,7 +22,7 @@ jobs:
test-git-proxy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout
- uses: actions/checkout@v2
- uses: actions/setup-go@v3
with:
go-version: '>=1.18.0'
Expand All @@ -38,7 +34,7 @@ jobs:
test-git-services:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v1
with:
Expand All @@ -50,15 +46,15 @@ jobs:
poetry install
- name: Test git services
run: |
cd git-https-proxy
pytest -v tests
cd git_services
poetry run pytest -v tests
test-chart:
needs: test
runs-on: ubuntu-latest
if: "startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master'"
steps:
- uses: actions/checkout
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
with:
python-version: 3.7
Expand Down
2 changes: 2 additions & 0 deletions git_services/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ def _make_branch(git_cli, name):
def init_git_repo(git_cli, create_file, commit_everything):
def _init_git_repo():
git_cli.git_init()
git_cli.git_config("user.name 'Test User'")
git_cli.git_config("user.email '[email protected]'")
print("Creating files in init git repo")
create_file("file1", "Sample file 1")
create_file("file2", "Sample file 2")
Expand Down

0 comments on commit 9d51b9b

Please sign in to comment.