File tree Expand file tree Collapse file tree 3 files changed +56
-0
lines changed Expand file tree Collapse file tree 3 files changed +56
-0
lines changed Original file line number Diff line number Diff line change @@ -60,6 +60,24 @@ install:
60
60
- micromamba env create -f environment.yml python=%PYTHON_VERSION% pywin32
61
61
- micromamba activate mpl-dev
62
62
63
+ before_build :
64
+ - git config --global user.name 'Matplotlib'
65
+ - git config --global user.email 'nobody@matplotlib.org'
66
+ - git fetch https://github.com/QuLogic/matplotlib.git text-overhaul-figures:text-overhaul-figures
67
+ - git merge --no-commit text-overhaul-figures || true
68
+ # If there are any conflicts in baseline images, then pick "ours",
69
+ # which should be the updated images in the PR.
70
+ - conflicts=$(git diff --name-only --diff-filter=U \
71
+ lib/matplotlib/tests/baseline_images \
72
+ lib/mpl_toolkits/*/tests/baseline_images)
73
+ if [ -n "${conflicts}" ]; then
74
+ git checkout --ours -- "${conflicts}"
75
+ git add -- "${conflicts}"
76
+ fi
77
+ # If committing fails, there were conflicts other than the baseline images,
78
+ # which should not be allowed to happen, and should fail the build.
79
+ - git commit -m 'Preload test images from branch text-overhaul-figures'
80
+
63
81
test_script :
64
82
# Now build the thing..
65
83
- set LINK=/LIBPATH:%cd%\lib
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 config --global user.name 'Matplotlib'
101
+ git config --global user.email 'nobody@matplotlib.org'
102
+ git fetch https://github.com/QuLogic/matplotlib.git text-overhaul-figures:text-overhaul-figures
103
+ git merge --no-commit text-overhaul-figures || true
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
+ git add -- "${conflicts}"
112
+ fi
113
+ # If committing fails, there were conflicts other than the baseline images,
114
+ # which should not be allowed to happen, and should fail the build.
115
+ git commit -m 'Preload test images from branch text-overhaul-figures'
116
+
98
117
- name : Set up Python ${{ matrix.python-version }}
99
118
uses : actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
100
119
with :
Original file line number Diff line number Diff line change @@ -68,6 +68,25 @@ stages:
68
68
architecture : ' x64'
69
69
displayName : ' Use Python $(python.version)'
70
70
71
+ - bash : |
72
+ git config --global user.name 'Matplotlib'
73
+ git config --global user.email 'nobody@matplotlib.org'
74
+ git fetch https://github.com/QuLogic/matplotlib.git text-overhaul-figures:text-overhaul-figures
75
+ git merge --no-commit text-overhaul-figures || true
76
+ # If there are any conflicts in baseline images, then pick "ours",
77
+ # which should be the updated images in the PR.
78
+ conflicts=$(git diff --name-only --diff-filter=U \
79
+ lib/matplotlib/tests/baseline_images \
80
+ lib/mpl_toolkits/*/tests/baseline_images)
81
+ if [ -n "${conflicts}" ]; then
82
+ git checkout --ours -- "${conflicts}"
83
+ git add -- "${conflicts}"
84
+ fi
85
+ # If committing fails, there were conflicts other than the baseline images,
86
+ # which should not be allowed to happen, and should fail the build.
87
+ git commit -m 'Preload test images from branch text-overhaul-figures'
88
+ displayName: Preload test images
89
+
71
90
- bash : |
72
91
choco install ninja
73
92
displayName: 'Install dependencies'
You can’t perform that action at this time.
0 commit comments