Merge pull request #1503 from j9ac9k/fix-git-head-reference-in-ci
Fix git head reference in ci
This commit is contained in:
commit
dc17e2ef1c
8
.github/workflows/main.yml
vendored
8
.github/workflows/main.yml
vendored
@ -23,7 +23,13 @@ jobs:
|
|||||||
qt-version: ""
|
qt-version: ""
|
||||||
numpy-version: ""
|
numpy-version: ""
|
||||||
steps:
|
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 }}
|
- name: Setup Python ${{ matrix.python-version }}
|
||||||
uses: actions/setup-python@v2
|
uses: actions/setup-python@v2
|
||||||
with:
|
with:
|
||||||
|
@ -469,6 +469,9 @@ def getTestDataRepo():
|
|||||||
"""
|
"""
|
||||||
global testDataTag
|
global testDataTag
|
||||||
|
|
||||||
|
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')
|
dataPath = os.path.join(os.path.expanduser('~'), '.pyqtgraph', 'test-data')
|
||||||
gitPath = 'https://github.com/pyqtgraph/test-data'
|
gitPath = 'https://github.com/pyqtgraph/test-data'
|
||||||
gitbase = gitCmdBase(dataPath)
|
gitbase = gitCmdBase(dataPath)
|
||||||
|
@ -4,7 +4,7 @@ xvfb_height = 1080
|
|||||||
# use this due to some issues with ndarray reshape errors on CI systems
|
# use this due to some issues with ndarray reshape errors on CI systems
|
||||||
xvfb_colordepth = 24
|
xvfb_colordepth = 24
|
||||||
xvfb_args=-ac +extension GLX +render
|
xvfb_args=-ac +extension GLX +render
|
||||||
faulthandler_timeout = 15
|
faulthandler_timeout = 30
|
||||||
|
|
||||||
filterwarnings =
|
filterwarnings =
|
||||||
# comfortable skipping these warnings runtime warnings
|
# comfortable skipping these warnings runtime warnings
|
||||||
|
Loading…
Reference in New Issue
Block a user