[CI] update scripts

- add sftp tranfert - generate github draft with appveyor - try to fix osx pyenv install
codac-team · Feb 16, 2020 · baa8d21 · baa8d21
1 parent dfe32d9
commit baa8d21
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 182 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,196 +4,63 @@ matrix:
   include:
   - sudo: true
     services:
-      - docker
+    - docker
     env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
     cache:
       directories:
-        - $HOME/ibex
-        - $HOME/Downloads
-        - $HOME/cache
+      - "$HOME/ibex"
+      - "$HOME/Downloads"
+      - "$HOME/cache"
     install:
-      - docker pull $DOCKER_IMAGE
+    - docker pull $DOCKER_IMAGE
     script:
-      - chmod a+x travis_script/docker_build_pyibex.sh
-      - docker run --rm -v `pwd`:/io $DOCKER_IMAGE /io/travis_script/docker_build_pyibex.sh
-      - ls wheelhouse
-
-  # - os: linux
-  #   language: pyhton
-  #   env: PYTHON=2.7 CPP=11 GCC=4.8
-  #   python: "2.7"
-  #   addons:
-  #     apt:
-  #       sources: [ubuntu-toolchain-r-test, kubuntu-backports, deadsnakes, george-edison55-precise-backports]
-  #       packages: [g++-4.8, cmake, cmake-data, pkg-config]
-  # - os: linux
-  #   language: python
-  #   env: PYTHON=3.4 CPP=11 GCC=4.8
-  #   python: "3.4"
-  #   addons:
-  #     apt:
-  #       sources: [ubuntu-toolchain-r-test, kubuntu-backports, deadsnakes, george-edison55-precise-backports]
-  #       packages: [g++-4.8, cmake, cmake-data, pkg-config]
-  #
-  # - os: linux
-  #   language: python
-  #   env: PYTHON=3.5 CPP=11 GCC=4.8
-  #   python: "3.5"
-  #   addons:
-  #     apt:
-  #       sources: [ubuntu-toolchain-r-test, kubuntu-backports, deadsnakes, george-edison55-precise-backports]
-  #       packages: [g++-4.8, cmake, cmake-data, pkg-config]
-  # - os: linux
-  #   language: python
-  #   env: PYTHON=3.6 CPP=11 GCC=4.8
-  #   python: "3.6"
-  #   addons:
-  #     apt:
-  #       sources: [ubuntu-toolchain-r-test, kubuntu-backports, deadsnakes, george-edison55-precise-backports]
-  #       packages: [g++-4.8, cmake, cmake-data, pkg-config]
-  # - os: linux
-  #   dist: xenial
-  #   language: python
-  #   env: PYTHON=3.7 CPP=11 GCC=4.8
-  #   python: "3.7"
-  #   addons:
-  #     apt:
-  #       sources: [ubuntu-toolchain-r-test, kubuntu-backports, deadsnakes, george-edison55-precise-backports]
-  #       packages: [g++-4.8, cmake, cmake-data, pkg-config]
-
+    - chmod a+x travis_script/docker_build_pyibex.sh
+    - docker run --rm -v `pwd`:/io $DOCKER_IMAGE /io/travis_script/docker_build_pyibex.sh
+    - ls wheelhouse
   - os: osx
-    # osx_image: xcode8.3
     env: PYTHON=2.7 CPP=14 CLANG
     install:
-      - brew upgrade pyenv
-      - bash ./travis_script/build_Ibex4pyIbex.sh 2>&1 1> ibex-build.log
+    # - brew upgrade pyenv
+    - git clone https://github.com/pyenv/pyenv.git ~/.pyenv
+    - export PYENV_ROOT="$HOME/.pyenv"
+    - export PATH="$PYENV_ROOT/bin:$PATH"
+    - bash ./travis_script/build_Ibex4pyIbex.sh 2>&1 1> ibex-build.log
     script:
-      - chmod a+x ./travis_script/build_osx.sh
-      - ./travis_script/build_osx.sh
-  # - os: osx
-  #   osx_image: xcode7.3
-  #   env: PYTHON=3.7 CPP=14 CLANG
-  # - os: osx
-  #   osx_image: xcode7.3
-  #   env: PYTHON=3.6.5 CPP=14 CLANG
+
+    - chmod a+x ./travis_script/build_osx.sh
+    - "./travis_script/build_osx.sh"
 env:
   global:
   - secure: QMtC7zYxU4pPwZrQ4OX2bjgPoei+2PYZPxuTOGewgI11HlbM7xFbryhloHeIeoeKXjKgUhCSY32lUiAP4NlT1ZkQVVr30m7FF+6hZkw6/bFvernOdr9kAd99Hg3uiunHCKoce7tTkIpo/eLTGAmr1Vbcc0FTZNagAWZmNClGOIw=
   - secure: cKkW9x5L4KFuq3bzb9uCsYSiXo/V55m96Ua122Wo7J5BfiagJqXoPc8PcWwx/qgLrCiT2xzW4fTp1DFDq97LsaXxEp/TWvzI+zPhB4tfUDzF95Dbvkl7A+sgmmSYkBiD146WP4KjmMGEv65RzIS9nFaRikF1X790Sxy/pEAhjLY=
-
 cache:
   directories:
-  - $HOME/ibex
-  - $HOME/Downloads
-  - $HOME/cache
-# matrix:
-#   include:
-#   - os: osx
-#     compiler: clang
-#   - os: linux
-#     language: python
-#     python: "3.4"
-#     compiler: gcc-4.8
-#   - os: linux
-#     language: python
-#     python: "3.5"
-    # compiler: gcc-4.8
-
-# before_install:
-  # - if [ $TRAVIS_OS_NAME == linux ]; then python -m pip install auditwheel twine; fi
-  # - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install python3; fi
-  # - if [ $TRAVIS_OS_NAME == osx ]; then pip install --user wheel twine; fi
-#  - if [ $TRAVIS_OS_NAME == osx ]; then brew install clang-omp; fi
-  # - bash ./travis_script/build_Ibex4pyIbex.sh 1> /dev/null
-  # - export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$HOME/ibex
-  # - |
-  #   # Configure build variables
-  #   if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-  #     if [ -z "$GCC" ]; then export GCC=4.8; fi
-  #     export CXX=g++-$GCC CC=gcc-$GCC;
-  #   elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-  #     export CXX=clang++ CC=clang;
-  #   fi
-  #   if [ -n "$CPP" ]; then export CPP=-std=c++$CPP; fi
-  #   if [ "${PYTHON:0:1}" = "3" ]; then export PY=3; fi
-  #   if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-  #       if [ "$PY" = "3" ]; then
-  #         pip install --upgrade pip ;
-  #       else
-  #         pip install --user --upgrade pip auditwheel twine;
-  #       fi
-  #   elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-  #     if [ "$PY" = "3" ]; then
-  #       brew update; brew upgrade python;
-  #       brew switch python$PYTHON
-  #     else
-  #       curl -fsSL -O https://bootstrap.pypa.io/get-pip.py;
-  #       sudo -H python get-pip.py;
-  #     fi
-  #     python$PY -m pip install --user --upgrade pip virtualenv;
-  #     python$PY -m virtualenv venv;
-  #     source venv/bin/activate;
-  #   fi
-
-
-
-# command to run tests
-# script:
-#   # - git clone -b build_process https://github.com/benEnsta/ibex-robotics.git ibex-robotics
-#   - mkdir build
-#   - cd build
-#   - ls ${HOME}/ibex
-#   - ls ${HOME}/ibex/lib
-
-#   - cmake -DCMAKE_INSTALL_PREFIX=${HOME} -DIBEX_ROOT=${HOME}/ibex -DPYTHON_VERSION=${version} -DPYBIND11_PYTHON_VERSION=$PYTHON -DPYBIND11_CPP_STANDARD=$CPP ../ ;
-#   - make && make install
-
-#   - make test ARGS="-VV"
-#   - make pip_package
-#   - export wheel_file=$(ls *.whl)
-  # - if [  $TRAVIS_OS_NAME == linux ]; then
-      # auditwheel repair $(ls *.whl);
-      # export wheel_file=$(ls wheelhouse/*.whl);
-    # fi
-
-  # - mv $wheel_file $TRAVIS_BUILD_DIR/$wheel_file
+  - "$HOME/ibex"
+  - "$HOME/Downloads"
+  - "$HOME/cache"
+addons:
+  ssh_known_hosts: bdesroch.privatedns.org
+before_install:
+- openssl aes-256-cbc -K $encrypted_566771925b72_key -iv $encrypted_566771925b72_iv
+  -in deploy_rsa.enc -out /tmp/deploy_rsa -d
+- eval "$(ssh-agent -s)"
+- chmod 600 /tmp/deploy_rsa
+- ssh-add /tmp/deploy_rsa
 after_failure: cat tests/test_cmake_build/*.log
 after_success:
-  - cd wheelhouse
-  - whl=$(ls *.whl)
-  - echo $whl
-  - for w in $whl; do
-      curl --ftp-create-dirs --ftp-ssl --insecure -v -k  -T $w --user $FTP_USER:$FTP_PASSWD  ftp://bdesroch.privatedns.org/gittmp/$(date +"%Y%m%d")/;
-    done;
-
-# deploy:
-#   skip_cleanup: true
-#   provider: releases
-#   api_key:
-#     secure: PLxHkV8vz8cdPMQKOm6BDAPUZgScq3frcuWUQ0PVsB66gu2mW+tnvIQzg0duom7rv9wrOksblkAhLRh2kNh7coLnlAD5AT7Y74PUjYv6sFsv9Obh0Kvc97v4/7eVg4xOcdcvPYEiYCQ/ZfXPzpkOcUF7IRYx4KKXN9CbVpbU/W8=
-#   file: $TRAVIS_BUILD_DIR/$wheel_file
-#   prerelease: true
-#   on:
-#     overwrite: true
-#     branch: master
-#     tag: true
-    # repo: benEnsta/pyIbex
-
-
-# deploy:
-#   provider: script
-#   skip_cleanup: true
-#   script: travis_script/deploy.sh
-#   on:
-#     branch: appveyor
-#     tag: false
+- cd wheelhouse
+- whl=$(ls *.whl)
+- echo $whl
+- rsync -avP -e "ssh -p 2993 -i /tmp/deploy_rsa -oStrictHostKeyChecking=no" *.whl
+  [email protected]:~/gittmp/$(date +"%Y%m%d")/;
 
-#deploy:
-#  skip_cleanup: true
-#  provider: releases
-#  api_key:
-#    secure: CuUogABlVRxUKWchoCT9PI7YwEmTRBhSjTEx+8Vi5HAb9Eq4nAR+Nc3bMHM0mSmxZn9lDGTjWDOMOdpg8nw80rZi1mCepO3fYa2eVrK6YlFIvZNLbAx2u4MUCXTYmsurpUiV7Du8LSbKA942y0RDCOX27pCyDCO5jfSOj7xlQWOgoryxfjFwsuBQntHMCWp/AH1HxlmJ40KZgQl4Nha2xuIJPBt2fYSBkjsWot0nd1hVhDUFxgi7zzOMAzC+vYrdmo89EVb4PfMPDlc+2LHnT7MMo7T7KrG1muRAryoOqsVsUfKXP9QUjGzpcjNKKimhB1ZikS/3ncEpQtO4/60TUY+cUJcw/22Idn5iReBnME21kpNUxiN7PvhirAs5g9Yic2f0uCIsLHXeqSWOTkwHZKyyyPKsDH/0/0SFYSihPawPOwqUPujLBAkIeHRf1REgsWyAFgxoSEgIs8r5/8Buj8ow7Ho/kR/QTJ5IZpgg806EOd8yxMa9C4H9LprK0J9el/pOFrgYBreQjTrxNyQhnnLSqUEumkH7atG5RRRW4pUCFMtO3pJp7EvgCWgFYlxU7NXLsjTcoNE6Juhu1RrkAdbpya90FqSobQ//cmaidMZNqqwbimH7XtUPO1iS/OuselmbcgsnD3QzgMwP0V4+XWfgWdg4On9QTUG/CS0LWec=
-#  file: $TRAVIS_BUILD_DIR/$wheel_file
-#  on:
-#    repo: benEnsta/pyIbex
-#    tags: true
+deploy:
+  provider: releases
+  api_key:
+    secure: FF07W49cTs+y/ypiIcdo0nBVn46LV/MKkhOd0VbEYEMuavPklIWpk0vz0V4b3VWRn7agiRr3ZWzYLML4KzhHqBONWkeuy4F6OdhfO0JxBUEqvgZo+JUaMPraiH3lnCzrOgxDC6MH+pRPqvN5TpcpLvaqE2jLcq0mxKqIN9wwekk=
+
+  file_glob: true
+  file: wheelhouse/*.whl
+  skip_cleanup: true
+  on:
+    repo: benEnsta/pyIbex
diff --git a/appveyor.yml b/appveyor.yml
@@ -87,12 +87,26 @@ build_script:
   - ctest -C %Configuration% -VV
   - msbuild %MSBuildOptions% src/pip_package.vcxproj
 
+# deploy:
+#   provider: FTP
+#   protocol: ftps
+#   host: bdesroch.privatedns.org
+#   username: git
+#   password:
+#     secure: U58Tazcrcj6n+oP1CxfRCQ==
+#   folder: gittmp/win
+#   artifact: pip_wheel
+
 deploy:
-  provider: FTP
-  protocol: ftps
-  host: bdesroch.privatedns.org
-  username: git
-  password:
-    secure: U58Tazcrcj6n+oP1CxfRCQ==
+  release: pyibex-v$(appveyor_build_version)
+  description: 'pyIbex windows build'
+  provider: GitHub
+  auth_token:
+    secure: Bu9kqyFD6errPkHu23iueJXI5x7JZ/8ZHVwoYNB1ZijEQ7KOySfC/sJ0fKBDgFOA
   folder: gittmp/win
   artifact: pip_wheel
+  draft: true
+  prerelease: false
+  # on:
+  #   branch: with_cmake      # release from master branch only
+  #   appveyor_repo_tag: false        # deploy on tag push only
diff --git a/deploy_rsa.enc b/deploy_rsa.enc
diff --git a/pybind11 b/pybind11