gcc10 on ubuntu18

lnkuiper · Oct 25, 2024 · 058f525 · 058f525
1 parent b8c5248
commit 058f525
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/.github/actions/ubuntu_18_setup/action.yml b/.github/actions/ubuntu_18_setup/action.yml
@@ -28,15 +28,24 @@ runs:
       run: |
         apt-get update -y -qq
         apt-get install -y -qq software-properties-common
-        add-apt-repository ppa:git-core/ppa
+        add-apt-repository -y ppa:git-core/ppa
+        add-apt-repository -y ppa:ubuntu-toolchain-r/test
         apt-get update -y -qq
-        apt-get install -y -qq --fix-missing ninja-build make gcc-multilib g++-multilib libssl-dev wget openjdk-8-jdk zip maven unixodbc-dev libc6-dev-i386 lib32readline6-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext unzip build-essential checkinstall libffi-dev curl libz-dev openssh-client pkg-config
+        apt-get install -y -qq --fix-missing ninja-build make gcc-10 g++-10 gcc-10-multilib g++-10-multilib libssl-dev wget openjdk-8-jdk zip maven unixodbc-dev libc6-dev-i386 lib32readline6-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext unzip build-essential checkinstall libffi-dev curl libz-dev openssh-client pkg-config
+        update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100
+        update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100
 
     - name: Install
       shell: bash
       if: ${{ inputs.aarch64_cross_compile == 1 }}
       run: |
-        apt-get install -y -qq gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+        sh -c 'echo "deb http://archive.ubuntu.com/ubuntu focal main universe" > /etc/apt/sources.list.d/focal-temp.list'
+        apt-get update -y -qq
+        apt-get install -y -qq -t focal gcc-10-aarch64-linux-gnu g++-10-aarch64-linux-gnu
+        rm /etc/apt/sources.list.d/focal-temp.list
+        apt-get update -y -qq
+        update-alternatives --install /usr/bin/aarch64-linux-gnu-gcc aarch64-linux-gnu-gcc /usr/bin/aarch64-linux-gnu-gcc-8 100
+        update-alternatives --install /usr/bin/aarch64-linux-gnu-g++ aarch64-linux-gnu-g++ /usr/bin/aarch64-linux-gnu-g++-8 100
 
     - name: Install Git 2.18.5
       shell: bash