Download as
Browse Code »

Commit 5ad6b568a2d5bed03fa4e42d66794d9bd34a04b0

Authored by Sergio Oliveira
1 parent d49a848c
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Fixed build_rpm script

Showing 2 changed files with 13 additions and 10 deletions   Show diff stats
.travis.yml
  Diff comments   View file @5ad6b56
1 1 language: python
2 2  
  3 +cache: apt
  4 +
3 5 python:
4 6 - "2.7"
5 7  
6 8 env:
7 9 - DJANGO_VERSION=1.7.3
8 10  
9   -install:
10   - - pip install coveralls flake8
11   - - pip install django==${DJANGO_VERSION}
12   - - pip install .
13   - - psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres
  11 +#install:
  12 +# - pip install coveralls flake8
  13 +# - pip install .
  14 +# - pip install django==${DJANGO_VERSION}
  15 +# - psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres
14 16  
15 17 script:
16 18 # - python setup.py test
... ...
ci/build_rpm.sh
  Diff comments   View file @5ad6b56
... ... @@ -10,10 +10,11 @@ sudo mkdir -p /tmp/centos-7/root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
10 10 sudo cp dist/colab-*.tar.gz /tmp/centos-7/root/rpmbuild/SOURCES/
11 11 sudo cp colab.spec /tmp/centos-7/root/rpmbuild/SPECS/
12 12 sudo cp ci/colab.repo /tmp/centos-7/etc/yum.repos.d/
13   -sudo cp ci/softwarepublico.key/tmp/centos-7/etc/yum.repos.d/
  13 +sudo cp ci/softwarepublico.key /tmp/centos-7/etc/yum.repos.d/
14 14  
15   -sudo chroot /tmp/centos-7
  15 +# Commands on chroot
  16 +
  17 +sudo chroot /tmp/centos-7/ yum install rpm-build
  18 +sudo chroot /tmp/centos-7/ yum install python-virtualenv colab-deps
  19 +sudo chroot /tmp/centos-7/ HOME=/root rpmbuild -ba /root/rpmbuild/SPECS/colab.spec
16 20  
17   -yum install rpm-build
18   -yum install python-virtualenv colab-deps
19   -HOME=/root rpmbuild -ba /root/rpmbuild/SPECS/colab.spec
... ...