X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e1fd558686c78d6edfd460b7531ec9b559299889..d8971ff1526d4698ee00f9fca864beed5a9d7498:/build/run-library.sh diff --git a/build/run-library.sh b/build/run-library.sh index a13470bc43..51678e6ed8 100755 --- a/build/run-library.sh +++ b/build/run-library.sh @@ -1,4 +1,7 @@ #!/bin/bash +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 # A library of functions shared by the various scripts in this directory. @@ -7,6 +10,12 @@ # older packages. LICENSE_PACKAGE_TS=20151208015500 +if [[ -z "$ARVADOS_BUILDING_VERSION" ]]; then + RAILS_PACKAGE_ITERATION=8 +else + RAILS_PACKAGE_ITERATION="$ARVADOS_BUILDING_ITERATION" +fi + debug_echo () { echo "$@" >"$STDOUT_IF_DEBUG" } @@ -33,20 +42,30 @@ format_last_commit_here() { } version_from_git() { - # Generates a version number from the git log for the current working - # directory, and writes it to stdout. - local git_ts git_hash prefix - if [[ -n "$1" ]] ; then - prefix="$1" - else - prefix="0.1" - fi + # Output the version being built, or if we're building a + # dev/prerelease, output a version number based on the git log for + # the current working directory. + if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then + echo "$ARVADOS_BUILDING_VERSION" + return + fi - declare $(format_last_commit_here "git_ts=%ct git_hash=%h") - echo "${prefix}.$(date -ud "@$git_ts" +%Y%m%d%H%M%S).$git_hash" + local git_ts git_hash prefix + if [[ -n "$1" ]] ; then + prefix="$1" + else + prefix="0.1" + fi + + declare $(format_last_commit_here "git_ts=%ct git_hash=%h") + echo "${prefix}.$(date -ud "@$git_ts" +%Y%m%d%H%M%S).$git_hash" } nohash_version_from_git() { + if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then + echo "$ARVADOS_BUILDING_VERSION" + return + fi version_from_git $1 | cut -d. -f1-3 } @@ -98,19 +117,27 @@ package_go_binary() { mkdir -p "$GOPATH/src/git.curoverse.com" ln -sfn "$WORKSPACE" "$GOPATH/src/git.curoverse.com/arvados.git" + (cd "$GOPATH/src/git.curoverse.com/arvados.git" && "$GOPATH/bin/govendor" sync -v) cd "$GOPATH/src/git.curoverse.com/arvados.git/$src_path" local version="$(version_from_git)" local timestamp="$(timestamp_from_git)" - # If the command imports anything from the Arvados SDK, bump the - # version number and build a new package whenever the SDK changes. + # Update the version number and build a new package if the vendor + # bundle has changed, or the command imports anything from the + # Arvados SDK and the SDK has changed. + declare -a checkdirs=(vendor) if grep -qr git.curoverse.com/arvados .; then - cd "$GOPATH/src/git.curoverse.com/arvados.git/sdk/go" - if [[ $(timestamp_from_git) -gt "$timestamp" ]]; then + checkdirs+=(sdk/go) + fi + for dir in ${checkdirs[@]}; do + cd "$GOPATH/src/git.curoverse.com/arvados.git/$dir" + ts="$(timestamp_from_git)" + if [[ "$ts" -gt "$timestamp" ]]; then version=$(version_from_git) + timestamp="$ts" fi - fi + done cd $WORKSPACE/packages/$TARGET test_package_presence $prog $version go @@ -119,7 +146,7 @@ package_go_binary() { return 1 fi - go get "git.curoverse.com/arvados.git/$src_path" + go get -ldflags "-X main.version=${version}" "git.curoverse.com/arvados.git/$src_path" declare -a switches=() systemd_unit="$WORKSPACE/${src_path}/${prog}.service" @@ -135,6 +162,10 @@ package_go_binary() { } default_iteration() { + if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then + echo "$ARVADOS_BUILDING_ITERATION" + return + fi local package_name="$1"; shift local package_version="$1"; shift local package_type="$1"; shift @@ -176,7 +207,7 @@ test_rails_package_presence() { cd $tmppwd - test_package_presence $pkgname $version rails $RAILS_PACKAGE_ITERATION + test_package_presence $pkgname $version rails "$RAILS_PACKAGE_ITERATION" } test_package_presence() { @@ -190,9 +221,7 @@ test_package_presence() { return 1 fi - if [[ "$iteration" == "" ]]; then - iteration="$(default_iteration "$pkgname" "$version" "$pkgtype")" - fi + iteration="$(default_iteration "$pkgname" "$version" "$pkgtype")" if [[ "$arch" == "" ]]; then rpm_architecture="x86_64" @@ -219,13 +248,19 @@ test_package_presence() { fi if [[ "$FORMAT" == "deb" ]]; then - local complete_pkgname=$pkgname"_"$version"-"$iteration"_"$deb_architecture".deb" + local complete_pkgname="${pkgname}_$version${iteration:+-$iteration}_$deb_architecture.deb" else - local complete_pkgname="$pkgname-$version-$iteration.$rpm_architecture.rpm" + # rpm packages get iteration 1 if we don't supply one + iteration=${iteration:-1} + local complete_pkgname="$pkgname-$version-${iteration}.$rpm_architecture.rpm" fi - if [[ -e "$complete_pkgname" ]]; then + # See if we can skip building the package, only if it already exists in the + # processed/ directory. If so, move it back to the packages directory to make + # sure it gets picked up by the test and/or upload steps. + if [[ -e "processed/$complete_pkgname" ]]; then echo "Package $complete_pkgname exists, not rebuilding!" + mv processed/$complete_pkgname . return 1 else echo "Package $complete_pkgname not found, building" @@ -241,30 +276,31 @@ handle_rails_package() { fi local srcdir="$1"; shift local license_path="$1"; shift + local version="$(version_from_git)" local scripts_dir="$(mktemp --tmpdir -d "$pkgname-XXXXXXXX.scripts")" && \ - local version_file="$(mktemp --tmpdir "$pkgname-XXXXXXXX.version")" && ( + ( set -e _build_rails_package_scripts "$pkgname" "$scripts_dir" cd "$srcdir" mkdir -p tmp - version_from_git >"$version_file" git rev-parse HEAD >git-commit.version bundle package --all ) if [[ 0 != "$?" ]] || ! cd "$WORKSPACE/packages/$TARGET"; then echo "ERROR: $pkgname package prep failed" >&2 - rm -rf "$scripts_dir" "$version_file" + rm -rf "$scripts_dir" EXITCODE=1 return 1 fi local railsdir="/var/www/${pkgname%-server}/current" - local -a pos_args=("$srcdir/=$railsdir" "$pkgname" "Curoverse, Inc." dir - "$(cat "$version_file")") + local -a pos_args=("$srcdir/=$railsdir" "$pkgname" "Curoverse, Inc." dir "$version") local license_arg="$license_path=$railsdir/$(basename "$license_path")" - local -a switches=(--iteration=$RAILS_PACKAGE_ITERATION - --after-install "$scripts_dir/postinst" + local -a switches=(--after-install "$scripts_dir/postinst" --before-remove "$scripts_dir/prerm" --after-remove "$scripts_dir/postrm") + if [[ -z "$ARVADOS_BUILDING_VERSION" ]]; then + switches+=(--iteration=$RAILS_PACKAGE_ITERATION) + fi # For some reason fpm excludes need to not start with /. local exclude_root="${railsdir#/}" # .git and packages are for the SSO server, which is built from its @@ -280,7 +316,7 @@ handle_rails_package() { done fpm_build "${pos_args[@]}" "${switches[@]}" \ -x "$exclude_root/vendor/bundle" "$@" "$license_arg" - rm -rf "$scripts_dir" "$version_file" + rm -rf "$scripts_dir" } # Build packages for everything @@ -348,6 +384,15 @@ fpm_build () { COMMAND_ARR+=(--deb-ignore-iteration-in-dependencies) fi + # 12271 - As FPM-generated packages don't include scripts by default, the + # packages cleanup on upgrade depends on files being listed on the %files + # section in the generated SPEC files. To remove DIRECTORIES, they need to + # be listed in that sectiontoo, so we need to add this parameter to properly + # remove lingering dirs. + if [[ rpm = "$FORMAT" ]]; then + COMMAND_ARR+=('--rpm-auto-add-directories') + fi + if [[ "${DEBUG:-0}" != "0" ]]; then COMMAND_ARR+=('--verbose' '--log' 'info') fi @@ -363,9 +408,11 @@ fpm_build () { if [[ "$VERSION" != "" ]]; then COMMAND_ARR+=('-v' "$VERSION") fi - # We can always add an --iteration here. If another one is specified in $@, - # that will take precedence, as desired. - COMMAND_ARR+=(--iteration "$default_iteration_value") + if [[ -n "$default_iteration_value" ]]; then + # We can always add an --iteration here. If another one is specified in $@, + # that will take precedence, as desired. + COMMAND_ARR+=(--iteration "$default_iteration_value") + fi if [[ python = "$PACKAGE_TYPE" ]] && [[ -e "${PACKAGE}/${PACKAGE_NAME}.service" ]] then