20846: Fix shell command in env var.
authorTom Clegg <tom@curii.com>
Mon, 20 Nov 2023 20:51:37 +0000 (15:51 -0500)
committerTom Clegg <tom@curii.com>
Mon, 20 Nov 2023 20:51:37 +0000 (15:51 -0500)
With Ruby 3, something uses the MAKE var without the expected
shell-eval, so the number-of-processors trick stopped working.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

    make --jobs \$\(grep -c processor /proc/cpuinfo\) DESTDIR\=
    sitearchdir\=./.gem.20231120-15-fa6sx6 sitelibdir\=./.gem.20231120-15-fa6sx6
    clean
    make: invalid option -- 'c'
    Usage: make [options] [target] ...
    Options:
      -b, -m                      Ignored for compatibility.
      [...]

build/package-build-dockerfiles/ubuntu2204/Dockerfile

index 7692f0fdb51a225a36c18d3f14362025b5874e33..b6c0a14ea9d1b5b681211f4560ced04c9441fd00 100644 (file)
@@ -59,7 +59,7 @@ RUN gpg --import --no-tty /tmp/mpapis.asc && \
 
 RUN /usr/local/rvm/bin/rvm-exec default bundle config --global jobs $(let a=$(grep -c processor /proc/cpuinfo )-1; echo $a)
 # Cf. https://build.betterup.com/one-weird-trick-that-will-speed-up-your-bundle-install/
-ENV MAKE "make --jobs $(grep -c processor /proc/cpuinfo)"
+ENV MAKE "make --jobs 8"
 
 # Preseed the go module cache and the ruby gems, using the currently checked
 # out branch of the source tree. This avoids potential compatibility issues