X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b2e1db4f3c44c6f41c37bfebf032526cf09bf9a6..7737b743baed690e98882a1bb3e44d1a76e45030:/build/run-library.sh diff --git a/build/run-library.sh b/build/run-library.sh index 95f2ff1452..f173504c58 100755 --- a/build/run-library.sh +++ b/build/run-library.sh @@ -110,11 +110,8 @@ calculate_go_package_version() { local -n __returnvar="$1"; shift local src_path="$1"; shift - 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" + cd "$WORKSPACE/$src_path" + go mod download local version="$(version_from_git)" local timestamp="$(timestamp_from_git)" @@ -126,7 +123,7 @@ calculate_go_package_version() { checkdirs+=(sdk/go lib) fi for dir in ${checkdirs[@]}; do - cd "$GOPATH/src/git.curoverse.com/arvados.git/$dir" + cd "$WORKSPACE/$dir" ts="$(timestamp_from_git)" if [[ "$ts" -gt "$timestamp" ]]; then version=$(version_from_git) @@ -319,7 +316,9 @@ test_package_presence() { # sure it gets picked up by the test and/or upload steps. # Get the list of packages from the repos - if [[ "$FORMAT" == "deb" ]]; then + if [[ "$FORCE_BUILD" == "1" ]]; then + echo "Package $full_pkgname build forced with --force-build, building" + elif [[ "$FORMAT" == "deb" ]]; then declare -A dd dd[debian9]=stretch dd[debian10]=buster