X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/380a54a7d97b34119cbaa3bee05d6b6cd241eee5..8ead06918642aa813655193d802ae82b9c363535:/build/run-library.sh diff --git a/build/run-library.sh b/build/run-library.sh index b0068d2112..b4c2d1ddc8 100755 --- a/build/run-library.sh +++ b/build/run-library.sh @@ -262,10 +262,8 @@ test_package_presence() { if [[ "$FORMAT" == "deb" ]]; then declare -A dd - dd[debian8]=jessie dd[debian9]=stretch dd[debian10]=buster - dd[ubuntu1404]=trusty dd[ubuntu1604]=xenial dd[ubuntu1804]=bionic D=${dd[$TARGET]} @@ -352,15 +350,6 @@ handle_rails_package() { if [[ "$pkgname" != "arvados-workbench" ]]; then exclude_list+=('config/database.yml') fi - # for arvados-api-server, we need to dereference the - # config/config.default.yml file. There is no fpm way to do that, sadly - # (excluding the existing symlink and then adding the file from its source - # path doesn't work, sadly. - if [[ "$pkgname" == "arvados-api-server" ]]; then - mv /arvados/services/api/config/config.default.yml /arvados/services/api/config/config.default.yml.bu - cp -p /arvados/lib/config/config.default.yml /arvados/services/api/config/ - exclude_list+=('config/config.default.yml.bu') - fi for exclude in ${exclude_list[@]}; do switches+=(-x "$exclude_root/$exclude") done @@ -368,11 +357,6 @@ handle_rails_package() { -x "$exclude_root/vendor/cache-*" \ -x "$exclude_root/vendor/bundle" "$@" "$license_arg" rm -rf "$scripts_dir" - # Undo the deferencing we did above - if [[ "$pkgname" == "arvados-api-server" ]]; then - rm -f /arvados/services/api/config/config.default.yml - mv /arvados/services/api/config/config.default.yml.bu /arvados/services/api/config/config.default.yml - fi } # Build python packages with a virtualenv built-in