Merge pull request #1503 from j9ac9k/fix-git-head-reference-in-ci

Fix git head reference in ci
This commit is contained in:
Ogi Moore 2021-01-19 21:05:14 -08:00 committed by GitHub
commit dc17e2ef1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 3 deletions

View File

@ -23,7 +23,13 @@ jobs:
qt-version: ""
numpy-version: ""
steps:
- uses: actions/checkout@v2
- name: Checkout
uses: actions/checkout@v2
- name: Checkout test-data
uses: actions/checkout@v2
with:
repository: pyqtgraph/test-data
path: .pyqtgraph/test-data
- name: Setup Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:

View File

@ -469,7 +469,10 @@ def getTestDataRepo():
"""
global testDataTag
dataPath = os.path.join(os.path.expanduser('~'), '.pyqtgraph', 'test-data')
if os.environ["CI"]:
dataPath = os.path.join(os.environ["GITHUB_WORKSPACE"], '.pyqtgraph', 'test-data')
else:
dataPath = os.path.join(os.path.expanduser('~'), '.pyqtgraph', 'test-data')
gitPath = 'https://github.com/pyqtgraph/test-data'
gitbase = gitCmdBase(dataPath)

View File

@ -4,7 +4,7 @@ xvfb_height = 1080
# use this due to some issues with ndarray reshape errors on CI systems
xvfb_colordepth = 24
xvfb_args=-ac +extension GLX +render
faulthandler_timeout = 15
faulthandler_timeout = 30
filterwarnings =
# comfortable skipping these warnings runtime warnings