From 9d51b9b2a9b7b79004a7e37a9b1d2286fccc13d2 Mon Sep 17 00:00:00 2001
From: Tasko Olevski <tasko.olevski@sdsc.ethz.ch>
Date: Mon, 4 Apr 2022 23:18:54 +0200
Subject: [PATCH] squashme: minor fixes

---
 .github/workflows/ci.yml       | 16 ++++++----------
 git_services/tests/conftest.py |  2 ++
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8fe67b1ca..87e96d549 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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:
@@ -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'
@@ -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:
@@ -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
diff --git a/git_services/tests/conftest.py b/git_services/tests/conftest.py
index ff1ea831b..bd5e5cedf 100644
--- a/git_services/tests/conftest.py
+++ b/git_services/tests/conftest.py
@@ -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 'test.user@renku.ch'")
         print("Creating files in init git repo")
         create_file("file1", "Sample file 1")
         create_file("file2", "Sample file 2")