File tree Expand file tree Collapse file tree 1 file changed +18
-0
lines changed Expand file tree Collapse file tree 1 file changed +18
-0
lines changed Original file line number Diff line number Diff line change 9595 fetch-depth : 0
9696 persist-credentials : false
9797
98+ - name : Preload test images
99+ run : |
100+ git config --global user.name 'Matplotlib'
101+ git config --global user.email '[email protected] ' 102+ git fetch https://github.com/QuLogic/matplotlib.git text-overhaul-figures:text-overhaul-figures
103+ git merge --no-commit text-overhaul-figures
104+ # If there are any conflicts in baseline images, then pick "ours",
105+ # which should be the updated images in the PR.
106+ conflicts=$(git diff --name-only --diff-filter=U \
107+ lib/matplotlib/tests/baseline_images \
108+ lib/mpl_toolkits/*/tests/baseline_images)
109+ if [ -n "${conflicts}" ]; then
110+ git checkout --ours "${conflicts}"
111+ fi
112+ # If this fails, there were conflicts other than the baseline images,
113+ # which should not be allowed to happen, and should fail the build.
114+ git commit -m 'Preload test images from branch text-overhaul-figures'
115+
98116 - name : Set up Python ${{ matrix.python-version }}
99117 uses : actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
100118 with :
You can’t perform that action at this time.
0 commit comments