[ARVADOS] updated: 2.1.0-1800-g56c4d0c08

Git user git at public.arvados.org
Wed Jan 5 21:39:44 UTC 2022


Summary of changes:
 build/run-library.sh                               |    4 +-
 build/run-tests.sh                                 |    2 +-
 doc/admin/spot-instances.html.textile.liquid       |    6 +-
 doc/admin/upgrading.html.textile.liquid            |    4 +
 go.mod                                             |   84 +-
 go.sum                                             |    2 -
 lib/config/config.default.yml                      |   18 +-
 lib/config/export.go                               |  182 +--
 lib/config/generate.go                             |   73 -
 lib/config/generated_config.go                     | 1665 --------------------
 lib/config/load.go                                 |    4 +
 lib/config/uptodate.go                             |    7 -
 sdk/go/arvados/config.go                           |   34 +-
 services/api/app/models/container_request.rb       |   57 +-
 services/api/config/arvados_config.rb              |    2 +-
 .../test/fixtures/api_client_authorizations.yml    |    7 +
 services/api/test/fixtures/containers.yml          |    1 +
 services/api/test/unit/container_request_test.rb   |  169 +-
 18 files changed, 357 insertions(+), 1964 deletions(-)
 delete mode 100644 lib/config/generate.go
 delete mode 100644 lib/config/generated_config.go
 delete mode 100644 lib/config/uptodate.go

       via  56c4d0c08266cacbca73e77aa82939e00a0bb69e (commit)
       via  3bfa2cd709a860d161326e66b8bf511f650d3f0e (commit)
       via  a371c7f1c7ea0d67572b025f9f2e590d2e1fbe01 (commit)
       via  98d63ca62daada9803edfdd5ad72304cae19b92c (commit)
       via  00f1f05789316936db75b4723b1c3d99196c252a (commit)
       via  b5440693dd818e382aad912ef0c1a8f813eb6131 (commit)
       via  a84ab41802835786e188b11e61f64f0db16d54c1 (commit)
       via  87f5edeeb1ec8c03a71c2cfa1656176735bfedca (commit)
       via  0a08f54c405dff0dbda5d6dbc14c1f1c6eeecd39 (commit)
       via  f4bd850b58cf8977960e3d18ced17fa1dd842747 (commit)
       via  534b7df510b99923a7dc273a2f8cacfd0c599800 (commit)
       via  63b40a5af92aef28d8416c945ffc7c9805ae8d7d (commit)
      from  836a871b3a985e74004d709de8ca80db7705180c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 56c4d0c08266cacbca73e77aa82939e00a0bb69e
Merge: 3bfa2cd70 a371c7f1c
Author: Ward Vandewege <ward at jhvc.com>
Date:   Wed Jan 5 16:38:52 2022 -0500

    17417: Merge branch 'main' into 17417-add-arm64
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --cc build/run-library.sh
index 9d0dffc0a,4a3e756ad..8a228622a
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@@ -221,26 -151,15 +221,26 @@@ package_go_binary_worker() 
      calculate_go_package_version go_package_version $src_path
  
      cd $WORKSPACE/packages/$TARGET
 -    test_package_presence $prog $go_package_version go
 -
 -    if [[ "$?" != "0" ]]; then
 -      return 1
 +    test_package_presence "$prog" "$go_package_version" "go" "" "$target_arch"
 +    if [[ $? -ne 0 ]]; then
 +      return 0
      fi
  
 -    go install -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=${go_package_version} -X main.version=${go_package_version}" "git.arvados.org/arvados.git/$src_path"
 +    echo "Building $package_format ($target_arch) package for $prog from $src_path"
 +    if [[ "$native_arch" == "amd64" ]] && [[ "$target_arch" == "arm64" ]]; then
-       CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc GOARCH=${target_arch} go get -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=${go_package_version} -X main.version=${go_package_version}" "git.arvados.org/arvados.git/$src_path"
++      CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc GOARCH=${target_arch} go install -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=${go_package_version} -X main.version=${go_package_version}" "git.arvados.org/arvados.git/$src_path"
 +    else
-       GOARCH=${arch} go get -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=${go_package_version} -X main.version=${go_package_version}" "git.arvados.org/arvados.git/$src_path"
++      GOARCH=${arch} go install -ldflags "-X git.arvados.org/arvados.git/lib/cmd.version=${go_package_version} -X main.version=${go_package_version}" "git.arvados.org/arvados.git/$src_path"
 +    fi
  
      local -a switches=()
 +
 +    binpath=$GOPATH/bin/${basename}
 +    if [[ "${target_arch}" != "${native_arch}" ]]; then
 +      switches+=("-a${target_arch}")
 +      binpath="$GOPATH/bin/linux_${target_arch}/${basename}"
 +    fi
 +
      systemd_unit="$WORKSPACE/${src_path}/${prog}.service"
      if [[ -e "${systemd_unit}" ]]; then
          switches+=(

commit 3bfa2cd709a860d161326e66b8bf511f650d3f0e
Merge: 836a871b3 98d63ca62
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Jan 5 16:35:02 2022 -0500

    17417: Merge branch 'main' into 17417-add-arm64
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>


-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list