Browse Source

Make switch-to-latest-clang less verbose and other small fixes.

master
Ray Burgemeestre 3 years ago
parent
commit
6d05aed453
3 changed files with 4 additions and 3 deletions
  1. +2
    -0
      fpm/Dockerfile-ubuntu2004
  2. +1
    -1
      fpm/Makefile
  3. +1
    -2
      switch-to-latest-clang

+ 2
- 0
fpm/Dockerfile-ubuntu2004 View File

ca-certificates \ ca-certificates \
libffi-dev \ libffi-dev \
ruby-ffi \ ruby-ffi \
rpm \
vim \
&& gem install fpm \ && gem install fpm \
&& mkdir /src/ && mkdir /src/



+ 1
- 1
fpm/Makefile View File

docker build . -f Dockerfile-ubuntu1804 -t rayburgemeestre/fpm-ubuntu:18.04 docker build . -f Dockerfile-ubuntu1804 -t rayburgemeestre/fpm-ubuntu:18.04


ubuntu2004fpm: ubuntu2004fpm:
docker pull rayburgemeestre/fpm-ubuntu:18.04 || true
docker pull rayburgemeestre/fpm-ubuntu:20.04 || true
docker build . -f Dockerfile-ubuntu2004 -t rayburgemeestre/fpm-ubuntu:20.04 docker build . -f Dockerfile-ubuntu2004 -t rayburgemeestre/fpm-ubuntu:20.04


publish1804: publish1804:

+ 1
- 2
switch-to-latest-clang View File

#!/bin/bash #!/bin/bash


set -ex

# set -ex
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-12 40 update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-12 40
update-alternatives --install /usr/bin/cc cc /usr/bin/clang-12 40 update-alternatives --install /usr/bin/cc cc /usr/bin/clang-12 40
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 40 update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 40

Loading…
Cancel
Save