Update Debian Pipeline to Bullseye (#3547)

* Update to gcc-10 for debian pipeline * Allow different gcc version in debian pipeline
xournalpp · Nov 8, 2021 · 0d8d375 · 0d8d375
1 parent 2ed7f70
commit 0d8d375
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/azure-pipelines/create-installers.yml b/azure-pipelines/create-installers.yml
@@ -56,14 +56,15 @@ stages:
         steps:
           - bash: |
               sudo apt-get update
-              sudo apt-get install -y build-essential gcc-8 g++-8 cmake ninja-build libcppunit-dev libgtk-3-dev libpoppler-glib-dev libxml2-dev portaudio19-dev libsndfile-dev liblua5.3-dev \
+              sudo apt-get install -y build-essential gcc-10 g++-10 cmake ninja-build libcppunit-dev libgtk-3-dev libpoppler-glib-dev libxml2-dev portaudio19-dev libsndfile-dev liblua5.3-dev \
                                       libzip-dev gettext lsb-release librsvg2-dev help2man
             displayName: 'Install dependencies'
           - 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: '10'
           - task: PublishPipelineArtifact@1
             inputs:
               artifactName: 'linux-debian-packages'

diff --git a/azure-pipelines/release.yml b/azure-pipelines/release.yml
@@ -64,14 +64,15 @@ stages:
         steps:
           - bash: |
               sudo apt-get update
-              sudo apt-get install -y build-essential gcc-8 g++-8 cmake ninja-build libcppunit-dev libgtk-3-dev libpoppler-glib-dev libxml2-dev portaudio19-dev libsndfile-dev liblua5.3-dev \
+              sudo apt-get install -y build-essential gcc-10 g++-10 cmake ninja-build libcppunit-dev libgtk-3-dev libpoppler-glib-dev libxml2-dev portaudio19-dev libsndfile-dev liblua5.3-dev \
                                       libzip-dev gettext lsb-release librsvg2-dev help2man
             displayName: 'Install dependencies'
           - 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: '10'
           - task: PublishPipelineArtifact@1
             inputs:
               artifactName: 'linux-debian-packages'

diff --git a/azure-pipelines/steps/build_linux.yml b/azure-pipelines/steps/build_linux.yml
@@ -5,14 +5,14 @@ parameters:
   build_type: 'Debug'
   cmake_flags: ''
   cmake_commands: ''
-
+  gcc_version: '8'
 steps:
   - bash: |
       mkdir build
     displayName: 'Create build directory'
   - bash: |
-      export CXX=g++-8
-      export CC=gcc-8
+      export CXX=g++-${{ parameters.gcc_version }}
+      export CC=gcc-${{ parameters.gcc_version }}
       cmake -GNinja .. -DCMAKE_BUILD_TYPE=${{ parameters.build_type}} ${{ parameters.cmake_flags }}
       # Make sure pot is up to date with sources (maybe translation pipeline is currently running)
       cmake --build . --target pot