1
0
mirror of https://github.com/gsi-upm/senpy synced 2024-12-21 20:48:14 +00:00
Commit Graph

559 Commits

Author SHA1 Message Date
J. Fernando Sánchez
24d85b18bb Merge branch 'meaningcloud' into 'master'
Updated makefiles from meaningcloud

See merge request docs/templates/makefiles!7
2017-10-03 16:25:49 +00:00
J. Fernando Sánchez
d150321741 Updated makefiles from meaningcloud
* Fixed some python+docker variables
* Improved defaults for docker image names
2017-10-03 18:24:30 +02:00
J. Fernando Sánchez
4f88009bd7 Merge branch 'senpy' into 'master'
Senpy

See merge request docs/templates/makefiles!6
2017-10-03 15:25:58 +00:00
J. Fernando Sánchez
390225df45 Fixed typo in .gitlab-ci 2017-10-03 17:19:14 +02:00
J. Fernando Sánchez
1f0703d535 Fixed typo in .gitlab-ci 2017-10-03 17:19:14 +02:00
J. Fernando Sánchez
b03e03fd0a Squashed '.makefiles/' changes from 21ff551..b20982c
b20982c Merge branch 'senpy' into 'master'
8fe7616 Updated makefiles from senpy
1543f55 Updated makefiles from senpy
f04cbee Testing new k8s mk

git-subtree-dir: .makefiles
git-subtree-split: b20982cae1
2017-10-03 17:16:27 +02:00
J. Fernando Sánchez
b20982cae1 Merge branch 'senpy' into 'master'
Senpy

See merge request docs/templates/makefiles!5
2017-10-03 15:16:01 +00:00
J. Fernando Sánchez
79e107bdcd Fixed mistake in .pypirc 2017-10-03 17:13:57 +02:00
J. Fernando Sánchez
c6e79fa50d Changed pypi repository 2017-10-03 17:05:24 +02:00
J. Fernando Sánchez
f6bf7459a8 Added push to github in fix-makefiles 2017-10-03 16:41:04 +02:00
J. Fernando Sánchez
c23f7986b4 Trying to fix push to github 2017-10-03 16:39:09 +02:00
J. Fernando Sánchez
300f4c374a Trying to fix push to github 2017-10-03 16:39:09 +02:00
J. Fernando Sánchez
97cd443c16 Push in fix-makefiles too 2017-10-03 15:17:40 +02:00
J. Fernando Sánchez
8fe7616bae Updated makefiles from senpy 2017-10-03 15:08:16 +02:00
J. Fernando Sánchez
49afd2cfdd Updated makefiles from senpy 2017-10-03 15:08:16 +02:00
J. Fernando Sánchez
1543f5550e Updated makefiles from senpy 2017-10-03 13:46:09 +02:00
J. Fernando Sánchez
c1174189c6 Updated makefiles from senpy 2017-10-03 13:46:09 +02:00
J. Fernando Sánchez
ea536c0daf Added fix-makefiles to deploy rules 2017-10-03 13:43:30 +02:00
J. Fernando Sánchez
a67e0e45d2 Simplified makefile 2017-10-03 13:42:17 +02:00
J. Fernando Sánchez
f04cbeeddb Testing new k8s mk 2017-10-03 13:41:51 +02:00
J. Fernando Sánchez
5f4dc3ac5d Testing new k8s mk 2017-10-03 13:41:51 +02:00
J. Fernando Sánchez
1a3b8ee703 Add '.makefiles/' from commit '21ff551769dd7e4ebd895b90d918040859a90e41'
git-subtree-dir: .makefiles
git-subtree-mainline: 9c61c18220
git-subtree-split: 21ff551769
2017-10-03 11:28:56 +02:00
J. Fernando Sánchez
9c61c18220 Removed .makefiles 2017-10-03 11:28:50 +02:00
J. Fernando Sánchez
21ff551769 Merge branch 'sentiment-meaningCloud' into 'master'
Updated makefiles from sentiment-meaningCloud

See merge request docs/templates/makefiles!4
2017-10-03 08:36:16 +00:00
militarpancho
3dc27f12f7 Updated makefiles from sentiment-meaningCloud 2017-10-02 13:12:17 +02:00
J. Fernando Sánchez
9957486f4f Merge branch 'gsictl' into 'master'
Gsictl

See merge request docs/templates/makefiles!3
2017-09-30 19:08:57 +00:00
J. Fernando Sánchez
0dc93fc16b Updated makefiles from gsictl 2017-09-29 15:53:14 +02:00
J. Fernando Sánchez
cbef9630b4 Updated makefiles from gsictl 2017-09-29 15:51:56 +02:00
J. Fernando Sánchez
a3a9414073 Updated makefiles from gsictl 2017-09-29 15:39:26 +02:00
J. Fernando Sánchez
14bcfd511f Updated makefiles from gsictl 2017-09-29 15:38:59 +02:00
J. Fernando Sánchez
3d23370a59 Updated makefiles from gsictl 2017-09-29 15:33:58 +02:00
J. Fernando Sánchez
f9a75f4e21 Updated makefiles from gsictl 2017-09-29 15:32:51 +02:00
J. Fernando Sánchez
99d4bc70bc Updated makefiles from gsictl 2017-09-29 15:32:11 +02:00
J. Fernando Sánchez
fc94b45448 Updated makefiles from gsictl 2017-09-29 15:14:29 +02:00
J. Fernando Sánchez
53db670715 Updated makefiles from gsictl 2017-09-29 15:11:08 +02:00
J. Fernando Sánchez
963211caf2 Updated makefiles from gsictl 2017-09-29 15:00:37 +02:00
J. Fernando Sánchez
2ca9d36f80 Merge branch 'senpy' into 'master'
K8s changes in senpy

See merge request docs/templates/makefiles!2
2017-09-28 10:57:51 +00:00
J. Fernando Sánchez
b1dbe432c1 Remove curly braces from makefile
In gitlab, make is using /bin/sh, which does not accept brace expansion
2017-09-28 10:39:29 +02:00
J. Fernando Sánchez
921d7f23ce Remove curly braces from makefile
In gitlab, make is using /bin/sh, which does not accept brace expansion
2017-09-28 10:39:29 +02:00
J. Fernando Sánchez
8bfb88c926 More fixes to k8s recipe 2017-09-28 10:33:26 +02:00
J. Fernando Sánchez
8ad2fae774 More fixes to k8s recipe 2017-09-28 10:33:26 +02:00
J. Fernando Sánchez
eb09da878f Fixed wildcard in k8s recipe 2017-09-28 10:22:46 +02:00
J. Fernando Sánchez
407fd718a3 Fixed wildcard in k8s recipe 2017-09-28 10:22:46 +02:00
J. Fernando Sánchez
3bba29fc4e Merge branch 'senpy' into 'master'
Senpy

See merge request docs/templates/makefiles!1
2017-09-27 19:46:04 +00:00
J. Fernando Sánchez
4344fccd57 Merge branch 'master' into 'senpy'
# Conflicts:
#   makefiles.mk
2017-09-27 19:45:43 +00:00
J. Fernando Sánchez
0ccdf735e1 Updated makefiles from senpy 2017-09-27 21:43:54 +02:00
J. Fernando Sánchez
7444aa7ec8 Updated makefiles from senpy 2017-09-27 21:43:54 +02:00
J. Fernando Sánchez
5d68c0225a Updated Makefile to include makefiles.mk 2017-09-27 21:38:27 +02:00
J. Fernando Sánchez
cda9f5c4ca Updated makefiles from senpy 2017-09-27 21:38:19 +02:00
J. Fernando Sánchez
a825e91425 Updated makefiles from senpy 2017-09-27 21:38:19 +02:00