Merge branch 'master' into use-nim-2.2
This commit is contained in:
commit
19dec3ecd1
|
@ -54,19 +54,12 @@ jobs:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set GCC 10 as default compiler (Linux)
|
|
||||||
if: runner.os == 'Linux' && matrix.target.cpu != 'i386' && matrix.target.os != 'linux-gcc-14'
|
|
||||||
run: |
|
|
||||||
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \
|
|
||||||
--slave /usr/bin/g++ g++ /usr/bin/g++-10 \
|
|
||||||
--slave /usr/bin/gcov gcov /usr/bin/gcov-10
|
|
||||||
|
|
||||||
- name: Install build dependencies (Linux i386)
|
- name: Install build dependencies (Linux i386)
|
||||||
if: runner.os == 'Linux' && matrix.target.cpu == 'i386'
|
if: runner.os == 'Linux' && matrix.target.cpu == 'i386'
|
||||||
run: |
|
run: |
|
||||||
sudo dpkg --add-architecture i386
|
sudo dpkg --add-architecture i386
|
||||||
sudo apt-fast update -qq
|
sudo apt-get update -qq
|
||||||
sudo DEBIAN_FRONTEND='noninteractive' apt-fast install \
|
sudo DEBIAN_FRONTEND='noninteractive' apt-get install \
|
||||||
--no-install-recommends -yq gcc-10-multilib g++-10-multilib \
|
--no-install-recommends -yq gcc-10-multilib g++-10-multilib \
|
||||||
libssl-dev:i386 linux-libc-dev:i386
|
libssl-dev:i386 linux-libc-dev:i386
|
||||||
mkdir -p external/bin
|
mkdir -p external/bin
|
||||||
|
|
Loading…
Reference in New Issue