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