diff options
| author | jspijker <j.spijker@ultimaker.com> | 2022-11-07 11:13:43 +0300 |
|---|---|---|
| committer | jspijker <j.spijker@ultimaker.com> | 2022-11-07 11:18:34 +0300 |
| commit | da304aec907a1b731785f7cac45af7b4f5171e97 (patch) | |
| tree | 10d57423f0e1f806e90159a22fd57474b4d303d7 | |
| parent | 4496f3fef34a41f8078af0ef109382585f365844 (diff) | |
Revert "Use GCC12 as default for all Linux runners"
This reverts commit 6ddc16709b4dcb9b6b2214ad36918dbe1c191b55.
| -rw-r--r-- | .github/workflows/conan-package-create.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/cura-installer.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index f76394a4ae..4af608b7ac 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -108,8 +108,8 @@ jobs: 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 - if: ${{ runner.os == 'Linux' }} + - name: Install GCC-12 on 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 diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 2c2287433f..99d12a5057 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -127,7 +127,7 @@ jobs: echo "APPIMAGETOOL_LOCATION=$GITHUB_WORKSPACE/appimagetool" >> $GITHUB_ENV - name: Install GCC-12 on ubuntu-22.04 - if: ${{ runner.os == 'Linux' }} + if: ${{ matrix.os == '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 |