songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
87,411 Commits 3 Branches 156 Tags 973 MiB
Commit Graph

120 Commits

Author SHA1 Message Date
Maxime Gimeno 7155df2743 Merge remote-tracking branch 'cgal/master' into liangliang_master 2019-07-01 14:59:24 +02:00
Laurent Rineau 2a5b558eb5 Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse 2019-06-20 10:28:01 +02:00
Liangliang Nan 0d0852c61b Create .travis.yml 2019-06-07 16:24:16 +02:00
Liangliang Nan 5061a00621 Merge branch 'master' of https://github.com/CGAL/cgal 2019-06-07 16:21:04 +02:00
Maxime Gimeno 39d81a8d68 Use LC_COLLATE to unify the order of the packages list. 2019-06-06 16:07:47 +02:00
Liangliang Nan 02ef4cae1c updated .travis.yml 
by calling generate_travis.sh
 2019-06-06 14:14:58 +02:00
Dmitry Anisimov 3738de08ed
Merge branch 'master' into Point_set_shape_detection_3-make_it_general_with_region_growing-danston 2019-05-23 10:38:45 +02:00
Laurent Rineau 1b92bcd74e Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 
# Conflicts:
#	.travis.yml
#	.travis/template.txt
 2019-05-20 12:27:11 +02:00
Laurent Rineau 7fe156dae7 Use $TRAVIS_PULL_REQUEST_BRANCH instead 
`TRAVIS_PULL_REQUEST` is actually never empty:
> `TRAVIS_PULL_REQUEST`: The pull request number if the current job is a pull request, “false” if it’s not a pull request.

(from the [documentation](https://docs.travis-ci.com/user/environment-variables/#default-environment-variables))

Use `TRAVIS_PULL_REQUEST_BRANCH` instead:
> `TRAVIS_PULL_REQUEST_BRANCH`:
>    - if the current job is a pull request, the name of the branch from which the PR originated.
>    - if the current job is a push build, this variable is empty ("").
 2019-05-15 11:46:52 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch 
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
 2019-05-14 17:50:45 +02:00
Maxime Gimeno 6c4ca97c25 Fix travis 2019-04-24 15:57:53 +02:00
Dmitry Anisimov ead5539da8 updated travis 2019-04-19 15:58:28 +02:00
Maxime Gimeno 4d5521e644 fix list of packages 2019-04-09 14:55:53 +02:00
Maxime Gimeno 78db3f646d Solve conflicts 2019-04-09 10:04:44 +02:00
Laurent Rineau 53709a4bce Try not to quote % 
And rename the `time` function in `build_package.sh`.
 2019-03-13 17:28:03 +01:00
Laurent Rineau cdf90303ce Parse error again! 2019-03-13 16:57:38 +01:00
Laurent Rineau 9bd51b2fdf Run yamllint 
- Quote `:`
- Remove trailing white-space
- Fix indentation
 2019-03-13 16:49:05 +01:00
Laurent Rineau 95b1f47076 Escape % with a backslash 2019-03-13 16:25:50 +01:00
Laurent Rineau 4858aee676 Quote % 2019-03-13 16:23:12 +01:00
Laurent Rineau c90335d8b0 Another attempt: I do not know why Travis cannot parse that file! 2019-03-13 16:14:53 +01:00
Laurent Rineau 438dc91139 Try with simple quotes 2019-03-13 16:12:32 +01:00
Laurent Rineau 11fe55cdb1 Use /usr/bin/time with a special format 2019-03-13 16:05:40 +01:00
Laurent Rineau 6e02c33fde Add calls to `time` to display timings 2019-03-08 16:01:07 +01:00
Maxime Gimeno ca4f5e12ed Merge remote-tracking branch 'cgal/master' into Periodic_4_hyperbolic_triangulation_2-IIordanov 2019-02-12 15:58:49 +01:00
Laurent Rineau 82403fb131
Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse 2019-02-12 08:24:43 +00:00
Maxime GIMENO d884aaadea Travis: Upgrade travis to xenial (#3666) 
Upgrade travis to xenial
 2019-02-12 08:23:09 +00:00
Laurent Rineau 49b3f3648f Try to upgrade Travis configuration to Xenial 2019-02-07 11:04:03 +01:00
Marc Glisse 678f911a47 C++14 tweaks 2019-02-06 13:56:05 +01:00
Maxime Gimeno 549568a954 Fix conflicts 2019-01-22 10:08:48 +01:00
Laurent Rineau f5a8686cf3 Merge pull request #3439 from aboudev/VSA-lingjie 
New package: Surface_mesh_approximation
 2019-01-22 09:17:35 +01:00
Maxime Gimeno d52718f312 Fix Conflicts 2019-01-21 10:03:31 +01:00
Mael Rouxel-Labbé 45b4735c23 Trying to please travis 2018-12-19 16:10:54 +01:00
Iordan Iordanov 089c7028c5 travis fixes 2018-12-11 10:10:02 +01:00
Sébastien Loriot 1ede8a09d9 update travis matrix 2018-11-30 10:45:23 +01:00
Sébastien Loriot 7e88a1ab5e update travis matrix 2018-11-14 19:00:26 +01:00
Laurent Rineau 89ffbdd15a Merge pull request #3292 from sloriot/Operations_on_polyhedra-remove_it 
Remove Operations_on_polyhedra
 2018-10-08 15:13:46 +02:00
Maxime Gimeno ce0e174819 Add tests, examples and demos to travis's call to cmake for CGAL 2018-10-04 16:06:46 +02:00
Sébastien Loriot fe655ec7b4 regenerate travis files 2018-08-23 13:27:18 +02:00
Sébastien Loriot 5efd5b9931 remove mentions to Operation_on_polyhedra package 2018-08-23 13:04:31 +02:00
Mael Rouxel-Labbé 7ea3a8044e Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-05 14:39:18 +02:00
Maxime Gimeno 102c772c8f Skip test of Maintenance dependencies. 2018-05-30 11:55:20 +02:00
Maxime Gimeno 190ce9db71 Fix condition for skipping tests. 2018-05-24 17:35:26 +02:00
Laurent Rineau c4fb5f995c Remove `-x` from the .travis.yml file: move it in build_package.sh 2018-05-23 15:29:58 +02:00
Maxime Gimeno 748363cc2e update travis.yml 2018-05-23 15:29:58 +02:00
Mael Rouxel-Labbé 17d46e9211 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-04-26 11:55:17 +02:00
Maxime Gimeno d72c4321ca clean-up 2018-04-12 14:59:23 +02:00
Maxime Gimeno 911c473f85 Drop entirely gcc tests. 2018-04-11 15:38:32 +02:00
Maxime Gimeno 90d15407a5 Try to move the test_package step into -install: 2018-04-06 11:38:23 +02:00
Maxime Gimeno 0ce75d7cc9 Fix template.txt 2018-03-05 12:55:01 +01:00
Maxime Gimeno 06dd065cec change travis.yml 2018-03-05 10:41:16 +01:00