From d54396dfb72d96c375d3f19200aa578394ce9132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sun, 8 Sep 2024 11:55:05 +0200 Subject: [PATCH] Check if Ubuntu 24.04 is available --- azure-pipelines.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b7965503..8e399f46 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -91,7 +91,7 @@ jobs: timeoutInMinutes: 90 dependsOn: CodeFormatValidation pool: - vmImage: 'ubuntu-22.04' + vmImage: 'ubuntu-24.04' steps: - script: | sudo apt-get update @@ -102,7 +102,7 @@ jobs: - script: | qtchooser -list-versions export DEFINES_VAR=DEFINES+\=\"BUILD_NUMBER=\\\\\\\"$(Build.BuildNumber)\\\\\\\"\" - qmake6 CONFIG+="unarr pdfium" $DEFINES_VAR + qmake6 CONFIG+="unarr" $DEFINES_VAR qmake6 -v make displayName: 'Build' @@ -118,21 +118,20 @@ jobs: timeoutInMinutes: 90 dependsOn: CodeFormatValidation pool: - vmImage: 'ubuntu-22.04' + vmImage: 'ubuntu-24.04' steps: - script: | sudo apt-get update sudo apt-get install -y qtchooser qt6-tools-dev qt6-base-dev-tools qmake6 qmake6-bin \ qt6-base-dev qt6-multimedia-dev qt6-tools-dev-tools libgl-dev qt6-l10n-tools \ - libqt6opengl6-dev libunarr-dev qt6-declarative-dev libqt6svg6-dev libqt6core5compat6-dev - mkdir $(Build.SourcesDirectory)\compressed_archive + libqt6opengl6-dev libunarr-dev qt6-declarative-dev libqt6svg6-dev libqt6core5compat6-dev libpoppler-qt6-dev mkdir $(Build.SourcesDirectory)\compressed_archive wget "https://github.com/YACReader/yacreader-7z-deps/blob/main/7z2301-src.7z?raw=true" -O $(Build.SourcesDirectory)/compressed_archive/7z2301-src.7z 7z x $(Build.SourcesDirectory)/compressed_archive/7z2301-src.7z -o$(Build.SourcesDirectory)/compressed_archive/lib7zip displayName: 'Install dependencies' - script: | qtchooser -list-versions export DEFINES_VAR=DEFINES+\=\"BUILD_NUMBER=\\\\\\\"$(Build.BuildNumber)\\\\\\\"\" - qmake6 CONFIG+="7zip pdfium" $DEFINES_VAR + qmake6 CONFIG+="7zip" $DEFINES_VAR qmake6 -v make displayName: 'Build'