GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 16:24:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CURA-10475_engineplugin' into CURA-10951_gh_build_curapackage

Browse Source
This commit is contained in:
Jelle Spijker 2023-08-30 11:36:33 +02:00
commit 77483794e0
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/linux.yml vendored
View File

@ -124,18 +124,11 @@ jobs:
chmod +x $GITHUB_WORKSPACE/appimagetool chmod +x $GITHUB_WORKSPACE/appimagetool
echo "APPIMAGETOOL_LOCATION=$GITHUB_WORKSPACE/appimagetool" >> $GITHUB_ENV echo "APPIMAGETOOL_LOCATION=$GITHUB_WORKSPACE/appimagetool" >> $GITHUB_ENV
- name: Install GCC-12 on ubuntu-22.04 - name: Install GCC-13
if: ${{ startsWith(inputs.operating_system, 'ubuntu-22.04') }}
run: | run: |
sudo apt install g++-12 gcc-12 -y sudo apt install g++-13 gcc-13 -y
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12 sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 13
- name: Use GCC-10 on ubuntu-20.04
if: ${{ startsWith(inputs.operating_system, '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 - name: Create the default Conan profile
run: conan profile new default --detect --force run: conan profile new default --detect --force