Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 964ef12

Browse filesBrowse files
GArikGArik
committed
Use MacOS 10.15.5 for build
To fix warnings like this: Warning: You are using macOS 10.13. 5We (and Apple) do not provide support for this old version. You will encounter build failures with some formulae. Also use Qt-5.15.2 which is installed in MacOS 10.15.5
1 parent f9bf025 commit 964ef12
Copy full SHA for 964ef12

File tree

Expand file treeCollapse file tree

2 files changed

+18
-25
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+18
-25
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+16-16Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
- stage: final
8080
- os: osx
8181
language: generic
82-
osx_image: xcode9.4
82+
osx_image: xcode11.6
8383
env:
8484
- MB_PYTHON_VERSION=3.6
8585
- ENABLE_CONTRIB=0
@@ -88,7 +88,7 @@ jobs:
8888

8989
- os: osx
9090
language: generic
91-
osx_image: xcode9.4
91+
osx_image: xcode11.6
9292
env:
9393
- MB_PYTHON_VERSION=3.7
9494
- ENABLE_CONTRIB=0
@@ -97,7 +97,7 @@ jobs:
9797

9898
- os: osx
9999
language: generic
100-
osx_image: xcode9.4
100+
osx_image: xcode11.6
101101
env:
102102
- MB_PYTHON_VERSION=3.8
103103
- ENABLE_CONTRIB=0
@@ -106,7 +106,7 @@ jobs:
106106

107107
- os: osx
108108
language: generic
109-
osx_image: xcode9.4
109+
osx_image: xcode11.6
110110
env:
111111
- MB_PYTHON_VERSION=3.9
112112
- ENABLE_CONTRIB=0
@@ -117,7 +117,7 @@ jobs:
117117
# headless builds for MacOS
118118
- os: osx
119119
language: generic
120-
osx_image: xcode9.4
120+
osx_image: xcode11.6
121121
env:
122122
- MB_PYTHON_VERSION=3.6
123123
- ENABLE_CONTRIB=0
@@ -126,7 +126,7 @@ jobs:
126126

127127
- os: osx
128128
language: generic
129-
osx_image: xcode9.4
129+
osx_image: xcode11.6
130130
env:
131131
- MB_PYTHON_VERSION=3.7
132132
- ENABLE_CONTRIB=0
@@ -135,7 +135,7 @@ jobs:
135135

136136
- os: osx
137137
language: generic
138-
osx_image: xcode9.4
138+
osx_image: xcode11.6
139139
env:
140140
- MB_PYTHON_VERSION=3.8
141141
- ENABLE_CONTRIB=0
@@ -144,7 +144,7 @@ jobs:
144144

145145
- os: osx
146146
language: generic
147-
osx_image: xcode9.4
147+
osx_image: xcode11.6
148148
env:
149149
- MB_PYTHON_VERSION=3.9
150150
- ENABLE_CONTRIB=0
@@ -155,7 +155,7 @@ jobs:
155155
# Contrib builds for MacOS
156156
- os: osx
157157
language: generic
158-
osx_image: xcode9.4
158+
osx_image: xcode11.6
159159
env:
160160
- MB_PYTHON_VERSION=3.6
161161
- ENABLE_CONTRIB=1
@@ -164,7 +164,7 @@ jobs:
164164

165165
- os: osx
166166
language: generic
167-
osx_image: xcode9.4
167+
osx_image: xcode11.6
168168
env:
169169
- MB_PYTHON_VERSION=3.7
170170
- ENABLE_CONTRIB=1
@@ -173,7 +173,7 @@ jobs:
173173

174174
- os: osx
175175
language: generic
176-
osx_image: xcode9.4
176+
osx_image: xcode11.6
177177
env:
178178
- MB_PYTHON_VERSION=3.8
179179
- ENABLE_CONTRIB=1
@@ -182,7 +182,7 @@ jobs:
182182

183183
- os: osx
184184
language: generic
185-
osx_image: xcode9.4
185+
osx_image: xcode11.6
186186
env:
187187
- MB_PYTHON_VERSION=3.9
188188
- ENABLE_CONTRIB=1
@@ -193,7 +193,7 @@ jobs:
193193
# headless contrib builds for MacOS
194194
- os: osx
195195
language: generic
196-
osx_image: xcode9.4
196+
osx_image: xcode11.6
197197
env:
198198
- MB_PYTHON_VERSION=3.6
199199
- ENABLE_CONTRIB=1
@@ -202,7 +202,7 @@ jobs:
202202

203203
- os: osx
204204
language: generic
205-
osx_image: xcode9.4
205+
osx_image: xcode11.6
206206
env:
207207
- MB_PYTHON_VERSION=3.7
208208
- ENABLE_CONTRIB=1
@@ -211,7 +211,7 @@ jobs:
211211

212212
- os: osx
213213
language: generic
214-
osx_image: xcode9.4
214+
osx_image: xcode11.6
215215
env:
216216
- MB_PYTHON_VERSION=3.8
217217
- ENABLE_CONTRIB=1
@@ -220,7 +220,7 @@ jobs:
220220

221221
- os: osx
222222
language: generic
223-
osx_image: xcode9.4
223+
osx_image: xcode11.6
224224
env:
225225
- MB_PYTHON_VERSION=3.9
226226
- ENABLE_CONTRIB=1

‎travis_config.sh

Copy file name to clipboardExpand all lines: travis_config.sh
+2-9Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,8 @@ function pre_build {
115115
brew install ffmpeg_opencv
116116
fi
117117

118-
# echo 'Installing qt5'
119-
120-
# if [ -n "$CACHE_STAGE" ]; then
121-
# echo "Qt5 has bottle, no caching needed"
122-
# else
123-
# brew switch qt 5.13.2
124-
# brew pin qt
125-
# export PATH="/usr/local/opt/qt/bin:$PATH"
126-
# fi
118+
echo 'Set up qt5'
119+
export PATH="/usr/local/opt/qt/bin:$PATH"
127120

128121
if [ -n "$CACHE_STAGE" ]; then
129122
brew_go_bootstrap_mode 0

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.