Skip to content

Commit 3f17c02

Browse files
committed
ci tweaks: platform and build config changes
abandon x86 on Windows, use xcode 11, test on forked FLASH
1 parent e7f5a02 commit 3f17c02

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,19 @@ matrix:
2929
language: python
3030
python: "3.7"
3131
- os: osx
32-
osx_image: xcode10.2
32+
osx_image: xcode11
3333
language: generic
3434
env: TRAVIS_PYTHON_VERSION="3.5"
3535
- os: osx
36-
osx_image: xcode10.2
36+
osx_image: xcode11
3737
language: generic
3838
env: TRAVIS_PYTHON_VERSION="3.6"
3939
- os: osx
40-
osx_image: xcode10.2
40+
osx_image: xcode11
4141
language: generic
4242
env: TRAVIS_PYTHON_VERSION="3.7"
4343

4444
before_install:
45-
- if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then sudo installer -pkg /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg -target /; fi # https://github.com/pyenv/pyenv/issues/1219
4645
- .build/choose_gcc.sh 8
4746
- |
4847
set -e
@@ -66,7 +65,7 @@ before_install:
6665
- .build/install_pyenv.sh
6766
# apps
6867
- git clone "https://github.com/mbdevpl/ffb-mini" "../ffb-mini"
69-
- git clone "https://github.com/ECP-Astro/FLASH5.git" "../flash5"
68+
- git clone "https://github.com/mbdevpl/FLASH5.git" "../flash5"
7069
- git clone "https://github.com/mbdevpl/miranda_io" "../miranda_io"
7170

7271
install:

appveyor.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,12 @@ version: "{build}"
22

33
environment:
44
matrix:
5-
- ARCHITECTURE: "x86"
6-
PYTHON_VERSION: "3.5"
7-
PYTHON: "C:\\Python35"
85
- ARCHITECTURE: "x64"
96
PYTHON_VERSION: "3.5"
107
PYTHON: "C:\\Python35-x64"
11-
- ARCHITECTURE: "x86"
12-
PYTHON_VERSION: "3.6"
13-
PYTHON: "C:\\Python36"
148
- ARCHITECTURE: "x64"
159
PYTHON_VERSION: "3.6"
1610
PYTHON: "C:\\Python36-x64"
17-
- ARCHITECTURE: "x86"
18-
PYTHON_VERSION: "3.7"
19-
PYTHON: "C:\\Python37"
2011
- ARCHITECTURE: "x64"
2112
PYTHON_VERSION: "3.7"
2213
PYTHON: "C:\\Python37-x64"

0 commit comments

Comments
 (0)