diff options
| author | jspijker <j.spijker@ultimaker.com> | 2022-11-07 11:18:28 +0300 |
|---|---|---|
| committer | jspijker <j.spijker@ultimaker.com> | 2022-11-07 11:18:34 +0300 |
| commit | 96597152bcd97abfe810ad506c032c6930846d81 (patch) | |
| tree | 4c4a3cf4f96607f32106a1bb4ef2f191c1205cd0 | |
| parent | da304aec907a1b731785f7cac45af7b4f5171e97 (diff) | |
Use GCC10 as default for Ubuntu-20.04
| -rw-r--r-- | .github/workflows/conan-package-create.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/cura-installer.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/unit-test.yml | 9 |
3 files changed, 17 insertions, 8 deletions
diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 4af608b7ac..d72f436154 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -115,6 +115,12 @@ jobs: sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12 sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12 + - name: Use GCC-10 on ubuntu-20.04 + if: ${{ startsWith(inputs.runs_on, 'ubuntu-20.04') }} + run: | + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10 + - name: Create the default Conan profile run: conan profile new default --detect diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 99d12a5057..371847e81e 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -116,7 +116,7 @@ jobs: run: brew install autoconf automake ninja create-dmg - name: Install Linux system requirements - if: ${{ runner.os == 'Linux' }} + if: ${{ startsWith(inputs.runs_on, 'ubuntu-22.04') }} run: | sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y sudo apt update @@ -127,12 +127,18 @@ jobs: echo "APPIMAGETOOL_LOCATION=$GITHUB_WORKSPACE/appimagetool" >> $GITHUB_ENV - name: Install GCC-12 on ubuntu-22.04 - if: ${{ matrix.os == 'ubuntu-22.04' }} + if: ${{ startsWith(inputs.runs_on, 'ubuntu-22.04') }} run: | sudo apt install g++-12 gcc-12 -y sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12 sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12 + - name: Use GCC-10 on ubuntu-20.04 + if: ${{ startsWith(inputs.runs_on, 'ubuntu-20.04') }} + run: | + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10 + - name: Create the default Conan profile run: conan profile new default --detect diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 035a2b8ef1..4f7d077432 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -107,17 +107,14 @@ jobs: - name: Install Linux system requirements if: ${{ runner.os == 'Linux' }} run: | - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y sudo apt update sudo apt upgrade sudo apt install build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev pkg-config -y - - name: Install GCC-12 on ubuntu-22.04 - if: ${{ startsWith(inputs.runs_on, 'ubuntu-22.04') }} + - name: Use GCC-10 on ubuntu-20.04 run: | - sudo apt install g++-12 gcc-12 -y - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12 + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10 - name: Get Conan configuration run: conan config install https://github.com/Ultimaker/conan-config.git |