Use gcc-10 on Ubuntu 22.04

xournalpp · Nov 16, 2022 · c0a2ec5 · c0a2ec5
1 parent 01e2413
commit c0a2ec5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/azure-pipelines/create-installers.yml b/azure-pipelines/create-installers.yml
@@ -51,6 +51,7 @@ stages:
         parameters:
           ubuntu_version: 22.04
           job_name: 'Ubuntu22_04'
+          gcc_version: '10'
       - job: 'Debian'
         pool:
           vmImage: 'ubuntu-18.04'

diff --git a/azure-pipelines/jobs/release_ubuntu.yml b/azure-pipelines/jobs/release_ubuntu.yml
@@ -7,6 +7,9 @@ parameters:
   - name: build_appimage
     type: boolean
     default: false
+  - name: gcc_version
+    type: string
+    default: '8'
 
 jobs:
   - job: '${{ parameters.job_name }}'
@@ -15,11 +18,14 @@ jobs:
     displayName: 'Build for Ubuntu ${{ parameters.ubuntu_version }}'
     steps:
       - template: ../steps/install_deps_ubuntu.yml
+        parameters:
+          gcc_version: ${{ parameters.gcc_version }}
       - template: ../steps/build_linux.yml
         parameters:
           build_type: 'RelWithDebInfo'
           cmake_flags: '-DCMAKE_DEBUG_INCLUDES_LDFLAGS=ON -DENABLE_CPPUNIT=ON -DDEBUG_COMPILE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCPACK_GENERATOR="TGZ;DEB"'
           cmake_commands: '--target package'
+          gcc_version: ${{ parameters.gcc_version }}
       - bash: |
           # Build AppImage
           export VERSION=$(cat VERSION | sed '1q;d')

diff --git a/azure-pipelines/release.yml b/azure-pipelines/release.yml
@@ -59,6 +59,7 @@ stages:
         parameters:
           ubuntu_version: 22.04
           job_name: 'Ubuntu22_04'
+          gcc_version: '10'
       - job: 'Debian'
         pool:
           vmImage: 'ubuntu-18.04'

diff --git a/azure-pipelines/steps/install_deps_ubuntu.yml b/azure-pipelines/steps/install_deps_ubuntu.yml
@@ -3,10 +3,11 @@
 
 parameters:
   build_type: 'Debug'
+  gcc_version: '8'
 
 steps:
   - bash: |
       sudo apt-get update
-      sudo apt-get install -y librsvg2-dev gcc-8 g++-8 cmake ninja-build libcppunit-dev libgtk-3-dev libpoppler-glib-dev portaudio19-dev libsndfile-dev liblua5.3-dev libzip-dev gettext help2man
+      sudo apt-get install -y librsvg2-dev gcc-${{ parameters.gcc_version }} g++-${{ parameters.gcc_version }} cmake ninja-build libcppunit-dev libgtk-3-dev libpoppler-glib-dev portaudio19-dev libsndfile-dev liblua5.3-dev libzip-dev gettext help2man
       g++ --version
     displayName: 'Install dependencies'