X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/44c95f99098fa6c6acbfa82d4b6cbc6015eb6e39..e38ac44d14e9006c24c93bca9de1ee299b16d367:/build/run-build-packages.sh diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh index a8e730c27f..2cde946d49 100755 --- a/build/run-build-packages.sh +++ b/build/run-build-packages.sh @@ -107,6 +107,9 @@ case "$TARGET" in debian8) FORMAT=deb ;; + debian9) + FORMAT=deb + ;; ubuntu1204) FORMAT=deb ;; @@ -217,7 +220,7 @@ if [[ -z "$ONLY_BUILD" ]] || [[ "libarvados-perl" = "$ONLY_BUILD" ]] ; then make install INSTALLDIRS=perl >"$STDOUT_IF_DEBUG" && \ fpm_build install/lib/=/usr/share libarvados-perl \ "Curoverse, Inc." dir "$(version_from_git)" install/man/=/usr/share/man \ - "$WORKSPACE/LICENSE-2.0.txt=/usr/share/doc/libarvados-perl/LICENSE-2.0.txt" && \ + "$WORKSPACE/apache-2.0.txt=/usr/share/doc/libarvados-perl/apache-2.0.txt" && \ mv --no-clobber libarvados-perl*.$FORMAT "$WORKSPACE/packages/$TARGET/" fi fi @@ -337,6 +340,7 @@ fi # Go binaries cd $WORKSPACE/packages/$TARGET export GOPATH=$(mktemp -d) +go get -v github.com/kardianos/govendor package_go_binary sdk/go/crunchrunner crunchrunner \ "Crunchrunner executes a command inside a container and uploads the output" package_go_binary services/arv-git-httpd arvados-git-httpd \ @@ -409,7 +413,7 @@ fi saladversion=$(cat "$WORKSPACE/sdk/cwl/setup.py" | grep schema-salad== | sed "s/.*==\(.*\)'.*/\1/") test_package_presence python-schema-salad "$saladversion" python if [[ "$?" == "0" ]]; then - fpm_build schema_salad "" "" python $saladversion --depends "${PYTHON2_PKG_PREFIX}-lockfile >= 1:0.12.2-2" + fpm_build schema_salad "" "" python $saladversion --depends "${PYTHON2_PKG_PREFIX}-lockfile >= 1:0.12.2-2" --depends "${PYTHON2_PKG_PREFIX}-avro = 1.8.1-2" fi # And for cwltool we have the same problem as for schema_salad. Ward, 2016-03-17 @@ -616,7 +620,9 @@ if [[ "$?" == "0" ]] ; then \cp config/application.yml.example config/application.yml -f \cp config/environments/production.rb.example config/environments/production.rb -f sed -i 's/secret_token: ~/secret_token: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/' config/application.yml + sed -i 's/keep_web_url: false/keep_web_url: exampledotcom/' config/application.yml + RAILS_ENV=production RAILS_GROUPS=assets bundle exec rake npm:install >/dev/null RAILS_ENV=production RAILS_GROUPS=assets bundle exec rake assets:precompile >/dev/null # Remove generated configuration files so they don't go in the package.