From 6ddc16709b4dcb9b6b2214ad36918dbe1c191b55 Mon Sep 17 00:00:00 2001 From: jelle spijker Date: Fri, 4 Nov 2022 10:13:41 +0100 Subject: [PATCH 1/2] Use GCC12 as default for all Linux runners --- .github/workflows/conan-package-create.yml | 4 ++-- .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 4af608b7ac..f76394a4ae 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-22.04 - if: ${{ startsWith(inputs.runs_on, 'ubuntu-22.04') }} + - name: Install GCC-12 on ubuntu + if: ${{ runner.os == 'Linux' }} 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 99d12a5057..2c2287433f 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: ${{ matrix.os == 'ubuntu-22.04' }} + if: ${{ runner.os == 'Linux' }} run: | sudo apt install g++-12 gcc-12 -y sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12 From 81f8939c1f3395b444d0ec1784895aba87d0f3a2 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Fri, 4 Nov 2022 13:40:49 +0100 Subject: [PATCH 2/2] Update resources/qml/WelcomePages/AddThirdPartyPrinter.qml Co-authored-by: Joey de l'Arago --- resources/qml/WelcomePages/AddThirdPartyPrinter.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/WelcomePages/AddThirdPartyPrinter.qml b/resources/qml/WelcomePages/AddThirdPartyPrinter.qml index df7a2a176d..f25cdccbf1 100644 --- a/resources/qml/WelcomePages/AddThirdPartyPrinter.qml +++ b/resources/qml/WelcomePages/AddThirdPartyPrinter.qml @@ -99,7 +99,7 @@ Item id: backButton anchors.left: parent.left anchors.bottom: parent.bottom - text: catalog.i18nc("@label", "Add Ultimaker printer via Digital Factory") + text: catalog.i18nc("@button", "Add Ultimaker printer via Digital Factory") onClicked: goToUltimakerPrinter() }