summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorDominic <yobmod@gmail.com>2021-07-12 23:02:16 +0100
committerGitHub <noreply@github.com>2021-07-12 23:02:16 +0100
commit210712fff0aec4baa97ebae1095ba0d9ddf5b13a (patch)
tree096782d02f31af3bb34168a77872561194b3af77 /.github
parent3b9b1538cb4eb58a35eaa1db60b9ac2900682b37 (diff)
parentb66bfbd1bc4eb45312ed44778c4072ae230cf63a (diff)
downloadgitpython-210712fff0aec4baa97ebae1095ba0d9ddf5b13a.tar.gz
Merge branch 'main' into pytest
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/pythonpackage.yml8
1 files changed, 7 insertions, 1 deletions
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index c350f78a..67832dc3 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -29,6 +29,12 @@ jobs:
run: |
set -x
python -m pip install --upgrade pip setuptools wheel
+1 conflicting file
+pythonpackage.yml
+.github/workflows/pythonpackage.yml
+.github/workflows/pythonpackage.yml
+1 conflict
+
python --version; git --version
git submodule update --init --recursive
git fetch --tags
@@ -55,7 +61,7 @@ jobs:
set -x
pip install mypy
mypy -p git
-
+
- name: Documentation
run: |
set -x