Skip to content

Commit

Permalink
Updated release to 2019 (issues #166 and #69). (#175)
Browse files Browse the repository at this point in the history
  • Loading branch information
bcoconni authored Mar 17, 2019
1 parent 574f855 commit 93eb2d3
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 13 deletions.
15 changes: 9 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
language: python
dist:
- xenial
python:
- "2.7"
- "3.4"
- "3.6"
env:
- USE_SYSTEM_EXPAT=OFF
- USE_SYSTEM_EXPAT=ON
Expand All @@ -11,6 +13,7 @@ notifications:
branches:
except:
- /^JSBSim-.*-v2018a.*$/
- /^Rolling-.*-v2019.*$/
- /^untagged-.*$/
# command to install dependencies
addons:
Expand Down Expand Up @@ -41,9 +44,9 @@ script:
- if [ "$USE_SYSTEM_EXPAT" = "OFF" ]; then python -c "import jsbsim;fdm=jsbsim.FGFDMExec('.', None)"; fi
after_success:
- cpack
- export TRAVIS_TAG=JSBSim-trusty-v2018a
- export TRAVIS_TAG=Rolling-release-v2019
# Build the API documentation with Doxygen (skip if we are building a pull request)
- if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PYTHON_VERSION" = "3.4" ] && [ "$USE_SYSTEM_EXPAT" = "OFF" ]; then make doc; fi
- if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PYTHON_VERSION" = "3.6" ] && [ "$USE_SYSTEM_EXPAT" = "OFF" ]; then make doc; fi

# If the build fails, the tests log will be uploaded to a gist under my account
# (bcoconni) so that they can be deleted when irrelevant. The output of the
Expand All @@ -52,9 +55,9 @@ after_failure:
- echo $GIST_TOKEN > ~/.gist
- gist -d "JSBSim build $TRAVIS_JOB_NUMBER failed" Testing/Temporary/*.log | envsubst
before_deploy:
- git tag -f $TRAVIS_TAG -m "Ubuntu Trusty 14.04 - Release - amd64"
- git tag -f $TRAVIS_TAG -m "Ubuntu Xenial 16.04 - Release - amd64"
# If the Python runtime is 2.7 then delete all Debian package but the Python module
# The other packages will be deployed by the Python 3.4 runtime
# The other packages will be deployed by the Python 3.6 runtime
- if [ "$TRAVIS_PYTHON_VERSION" = "2.7" ] && [ "$USE_SYSTEM_EXPAT" = "ON" ]; then rm -f JSBSim*.deb; fi
deploy:
# Deploy the Debian packages
Expand Down Expand Up @@ -90,5 +93,5 @@ deploy:
github_token: $GITHUB_TOKEN
verbose: true
on:
python: 3.4
python: 3.6
condition: $USE_SYSTEM_EXPAT = OFF
17 changes: 10 additions & 7 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,19 @@ version: 1.0.{build}
init:
- set PATH=c:\python37-x64;c:\python37-x64\Scripts;%PATH%
- ren c:\python27 python27-hide

install:
- pip install cython numpy pandas scipy wheel pywin32
# Upgrade setuptools to recognize the parameter long_description_content_type
- pip install -U setuptools

build_script:
# Install CXXTest for C++ unit tests
- git clone --depth=10 --branch=4.4 https://github.com/CxxTest/cxxtest.git
- set PATH=%CD%\cxxtest;%PATH%
- cd cxxtest\python
- python setup.py install
- cd ..\..

build_script:
# Build JSBSim
- md build
- cd build
Expand All @@ -37,6 +38,8 @@ build_script:
- python python\setup.py sdist
- python python\setup.py build_scripts
- python python\setup.py bdist_wheel --skip-build --config RelWithDebInfo

test_script:
# Check that the Python module correctly installs
- pip install python\dist\JSBSim-1.0.0.dev1-cp37-cp37m-win_amd64.whl
- python -c "import jsbsim;fdm=jsbsim.FGFDMExec('.', None)"
Expand All @@ -53,13 +56,13 @@ on_failure:

artifacts:
- path: build\src\RelWithDebInfo\JSBSim.exe
name: JSBSim_Release_x64_v2018a
name: Rolling_Release_x64_v2019

- path: build\utils\aeromatic++\RelWithDebInfo\aeromatic.exe
name: JSBSim_Release_x64_v2018a
name: Rolling_Release_x64_v2019

- path: build\python\dist\JSBSim-1.0.0.dev1-cp37-cp37m-win_amd64.whl
name: JSBSim_Release_x64_v2018a
name: Rolling_Release_x64_v2019

# Do not build on tags (GitHub and BitBucket)
# to avoid infinite build loops
Expand All @@ -69,8 +72,8 @@ skip_tags: true

deploy:
- provider: GitHub
tag: JSBSim-trusty-v2018a
description: Windows - Release - x64
tag: Rolling_Release_x64_v2019
description: Release - x64
auth_token:
secure: YWG8FRFWv/ylTuA1DIFNcN01uFGz7xKit8CayOMTE0orPKXhztwLmwm8MZ4IzFbr
artifact: build\src\RelWithDebInfo\JSBSim.exe,build\utils\aeromatic++\RelWithDebInfo\aeromatic.exe,build\python\dist\JSBSim-1.0.0.dev1-cp37-cp37m-win_amd64.whl
Expand Down

0 comments on commit 93eb2d3

Please sign in to comment.