diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml index 3a8b1a9cb..d5d5ce831 100644 --- a/.github/workflows/github.yml +++ b/.github/workflows/github.yml @@ -1,6 +1,6 @@ name: Windows Tests -on: [push] +on: [push, pull_request] jobs: build: @@ -126,6 +126,20 @@ jobs: twine upload -r testpypi dist/* -u "cgal" -p ${{ secrets.TPPPW }} --non-interactive --skip-existing shell: bash +on: [push] +jobs: + build: + runs-on: windows-2016 + strategy: + max-parallel: 4 + matrix: + cgal_branch: [master] + python_minor_version: [6, 7, 8] + + steps: + - name: Test + run: echo "coucou" + # - name: Upload wheel # uses: actions/upload-artifact@v1 # if: failure() diff --git a/.integration/travis.sh b/.integration/travis.sh index ad5b89e14..61eb2632a 100644 --- a/.integration/travis.sh +++ b/.integration/travis.sh @@ -9,8 +9,10 @@ if [ $(python -c "import sys; print(sys.version_info.major)") = "3" ] && [ "$TR cd examples/python for test_file in ./*.py; do python $test_file; done cd ../.. - twine upload -r testpypi wheelhouse/* -u "cgal" -p "$CGALTestPyPiPassword" --non-interactive --skip-existing - + if [ -n "$DO_UPLOAD" ]; then + twine upload -r testpypi wheelhouse/* -u "cgal" -p "$CGALTestPyPiPassword" --non-interactive --skip-existing + fi + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=~/.local/ -DBUILD_PYTHON=OFF . make -j2 VERBOSE=1 && make install -j2 && make tests -j2 VERBOSE=1 && ctest -j2 --output-on-failure elif [ $(python -c "import sys; print(sys.version_info.major)") = "3" ] && [ "$TRAVIS_OS_NAME" = "osx" ]; then @@ -20,7 +22,9 @@ elif [ $(python -c "import sys; print(sys.version_info.major)") = "3" ] && [ "$ cd ../.. cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=~/.local/ -DBUILD_PYTHON=OFF . make -j2 VERBOSE=1 && make install -j2 && make tests -j2 VERBOSE=1 && ctest -j2 --output-on-failure - twine upload -r testpypi fixed_wheel/* -u "cgal" -p "$CGALTestPyPiPassword" --non-interactive --skip-existing + if [ -n "$DO_UPLOAD" ]; then + twine upload -r testpypi fixed_wheel/* -u "cgal" -p "$CGALTestPyPiPassword" --non-interactive --skip-existing + fi else cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=~/.local/ -DPython_FIND_VERSION_MAJOR=2 . make -j2 VERBOSE=1 && make install -j2 && make tests -j2 VERBOSE=1 && ctest -j2 --output-on-failure diff --git a/.travis.yml b/.travis.yml index f43c61a61..9ee2a1c62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,9 @@ env: - CGAL_PYTHON_EXAMPLES=examples/python - PYCODESTYLE_CONVENTIONS="--max-line-length=120" - secure: LJapS6f/ZojkerZ6me1RHnPC3QAqivtsM0F3pnp8QRcala4PRGn8BIG7CfSrWYEy1RmmniWCNzS5CHsP6qLrAKtYeTNSdbSomx0uhatwXVTlllcDsyAwenqCgtGXejJ4T0HmRi8meURPjhJ77UMmvpfL3vqqfFpW0hYZsDEd/sA= + include: + if: type = push + env: DO_UPLOAD="TRUE" matrix: include: - os: osx @@ -90,7 +93,7 @@ addons: - libgl1-mesa-dev - libtbb-dev before_install: -- echo $PATH +- echo $DO_UPLOAD - if [ "$TRAVIS_OS_NAME" = "osx" ]; then source .integration/osx_utils.sh && get_macpython_environment $MB_PYTHON_VERSION; fi - python -m pip install --upgrade pip