Skip to content

Commit

Permalink
Don't upload in tests from PRs
Browse files Browse the repository at this point in the history
  • Loading branch information
maxGimeno committed Aug 5, 2020
1 parent 81bfeb9 commit cc48c39
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 5 deletions.
16 changes: 15 additions & 1 deletion .github/workflows/github.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Windows Tests

on: [push]
on: [push, pull_request]

jobs:
build:
Expand Down Expand Up @@ -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()
Expand Down
10 changes: 7 additions & 3 deletions .integration/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit cc48c39

Please sign in to comment.