From b5e7aff7f17a2a39e442c877bc3c85616ffb2e57 Mon Sep 17 00:00:00 2001 From: Jared Van Bortel Date: Fri, 20 Sep 2024 18:26:17 -0400 Subject: [PATCH] ci: make commands for Qt install to reduce repetition Signed-off-by: Jared Van Bortel --- .circleci/continue_config.yml | 102 ++++++++++++++++------------------ 1 file changed, 48 insertions(+), 54 deletions(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index 04edba71..084f386e 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -18,6 +18,45 @@ parameters: type: boolean default: false +commands: + install_qt_macos: + steps: + - run: + name: Installing Qt + command: | + curl -OL https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-macOS-x64-4.8.0.dmg + hdiutil attach qt-online-installer-macOS-x64-4.8.0.dmg + /Volumes/qt-online-installer-macOS-x64-4.8.0/qt-online-installer-macOS-x64-4.8.0.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.0 \ + --no-force-installations --no-default-installations --no-size-checking --default-answer \ + --accept-licenses --confirm-command --accept-obligations --email $QT_EMAIL --password $QT_PASSWORD \ + install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.672.clang_64 qt.qt6.672.qt5compat \ + qt.qt6.672.debug_info qt.qt6.672.addons.qtpdf qt.qt6.672.addons.qthttpserver + hdiutil detach /Volumes/qt-online-installer-macOS-x64-4.8.0 + install_qt_linux: + steps: + - run: + name: Installing Qt + command: | + curl -OL https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-linux-x64-4.8.0.run + chmod +x qt-online-installer-linux-x64-4.8.0.run + ./qt-online-installer-linux-x64-4.8.0.run --no-force-installations --no-default-installations \ + --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations \ + --email $QT_EMAIL --password $QT_PASSWORD \ + install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.672.gcc_64 qt.qt6.672.qt5compat \ + qt.qt6.672.debug_info qt.qt6.672.addons.qtpdf qt.qt6.672.addons.qthttpserver + install_qt_windows: + steps: + - run: + name: Installing Qt + command: | + Invoke-WebRequest -Uri https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-windows-x64-4.8.0.exe ^ + -OutFile qt-online-installer-windows-x64-4.8.0.exe + & .\qt-online-installer-windows-x64-4.8.0.exe --no-force-installations --no-default-installations ^ + --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations ^ + --email ${Env:QT_EMAIL} --password ${Env:QT_PASSWORD} ^ + install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.672.win64_msvc2019_64 qt.qt6.672.qt5compat ^ + qt.qt6.672.debug_info qt.qt6.672.addons.qtpdf qt.qt6.672.addons.qthttpserver + jobs: build-offline-chat-installer-macos: macos: @@ -38,13 +77,7 @@ jobs: - run: name: Install dependencies command: brew install ccache - - run: - name: Installing Qt - command: | - curl -OL https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-macOS-x64-4.8.0.dmg - hdiutil attach qt-online-installer-macOS-x64-4.8.0.dmg - /Volumes/qt-online-installer-macOS-x64-4.8.0/qt-online-installer-macOS-x64-4.8.0.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.0 --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email $QT_EMAIL --password $QT_PASSWORD install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.672.clang_64 qt.qt6.672.qt5compat qt.qt6.672.debug_info qt.qt6.672.addons.qtpdf qt.qt6.672.addons.qthttpserver - hdiutil detach /Volumes/qt-online-installer-macOS-x64-4.8.0 + - install_qt_macos - run: name: Setup Keychain command: | @@ -176,13 +209,7 @@ jobs: - run: name: Install dependencies command: brew install ccache - - run: - name: Installing Qt - command: | - curl -o qt-online-installer-macOS-x64-4.8.0.dmg https://gpt4all.io/ci/qt-online-installer-macOS-x64-4.8.0.dmg - hdiutil attach qt-online-installer-macOS-x64-4.8.0.dmg - /Volumes/qt-online-installer-macOS-x64-4.8.0/qt-online-installer-macOS-x64-4.8.0.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.0 --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email $QT_EMAIL --password $QT_PASSWORD install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.672.clang_64 qt.qt6.672.qt5compat qt.qt6.672.debug_info qt.qt6.672.addons.qtpdf qt.qt6.672.addons.qthttpserver - hdiutil detach /Volumes/qt-online-installer-macOS-x64-4.8.0 + - install_qt_macos - run: name: Setup Keychain command: | @@ -326,12 +353,7 @@ jobs: ) sudo apt-get update sudo apt-get install -y "${packages[@]}" - - run: - name: Installing Qt - command: | - curl -OL https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-linux-x64-4.8.0.run - chmod +x qt-online-installer-linux-x64-4.8.0.run - ./qt-online-installer-linux-x64-4.8.0.run --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email $QT_EMAIL --password $QT_PASSWORD install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.672.gcc_64 qt.qt6.672.qt5compat qt.qt6.672.debug_info qt.qt6.672.addons.qtpdf qt.qt6.672.addons.qthttpserver + - install_qt_linux - run: name: Build linuxdeployqt command: | @@ -402,12 +424,7 @@ jobs: ) sudo apt-get update sudo apt-get install -y "${packages[@]}" - - run: - name: Installing Qt - command: | - curl -OL https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-linux-x64-4.8.0.run - chmod +x qt-online-installer-linux-x64-4.8.0.run - ./qt-online-installer-linux-x64-4.8.0.run --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email $QT_EMAIL --password $QT_PASSWORD install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.672.gcc_64 qt.qt6.672.qt5compat qt.qt6.672.debug_info qt.qt6.672.addons.qtpdf qt.qt6.672.addons.qthttpserver + - install_qt_linux - run: name: Build linuxdeployqt command: | @@ -467,11 +484,7 @@ jobs: - run: name: Install dependencies command: choco install -y ccache - - run: - name: Installing Qt - command: | - Invoke-WebRequest -Uri https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-windows-x64-4.8.0.exe -OutFile qt-online-installer-windows-x64-4.8.0.exe - & .\qt-online-installer-windows-x64-4.8.0.exe --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email ${Env:QT_EMAIL} --password ${Env:QT_PASSWORD} install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.672.win64_msvc2019_64 qt.qt6.672.qt5compat qt.qt6.672.debug_info qt.qt6.672.addons.qtpdf qt.qt6.672.addons.qthttpserver + - install_qt_windows - run: name: Install VulkanSDK command: | @@ -588,11 +601,7 @@ jobs: - run: name: Install dependencies command: choco install -y ccache - - run: - name: Installing Qt - command: | - Invoke-WebRequest -Uri https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-windows-x64-4.8.0.exe -OutFile qt-online-installer-windows-x64-4.8.0.exe - & .\qt-online-installer-windows-x64-4.8.0.exe --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email ${Env:QT_EMAIL} --password ${Env:QT_PASSWORD} install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.672.win64_msvc2019_64 qt.qt6.672.qt5compat qt.qt6.672.debug_info qt.qt6.672.addons.qtpdf qt.qt6.672.addons.qthttpserver + - install_qt_windows - run: name: Install VulkanSDK command: | @@ -733,12 +742,7 @@ jobs: ) sudo apt-get update sudo apt-get install -y "${packages[@]}" - - run: - name: Installing Qt - command: | - curl -OL https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-linux-x64-4.8.0.run - chmod +x qt-online-installer-linux-x64-4.8.0.run - ./qt-online-installer-linux-x64-4.8.0.run --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email $QT_EMAIL --password $QT_PASSWORD install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.672.gcc_64 qt.qt6.672.qt5compat qt.qt6.672.debug_info qt.qt6.672.addons.qtpdf qt.qt6.672.addons.qthttpserver + - install_qt_linux - run: name: Build command: | @@ -780,11 +784,7 @@ jobs: - run: name: Install dependencies command: choco install -y ccache - - run: - name: Installing Qt - command: | - Invoke-WebRequest -Uri https://qt.mirror.constant.com/archive/online_installers/4.8/qt-online-installer-windows-x64-4.8.0.exe -OutFile qt-online-installer-windows-x64-4.8.0.exe - & .\qt-online-installer-windows-x64-4.8.0.exe --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email ${Env:QT_EMAIL} --password ${Env:QT_PASSWORD} install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.672.win64_msvc2019_64 qt.qt6.672.qt5compat qt.qt6.672.debug_info qt.qt6.672.addons.qtpdf qt.qt6.672.addons.qthttpserver + - install_qt_windows - run: name: Install VulkanSDK command: | @@ -841,13 +841,7 @@ jobs: - run: name: Install dependencies command: brew install ccache - - run: - name: Installing Qt - command: | - curl -o qt-online-installer-macOS-x64-4.8.0.dmg https://gpt4all.io/ci/qt-online-installer-macOS-x64-4.8.0.dmg - hdiutil attach qt-online-installer-macOS-x64-4.8.0.dmg - /Volumes/qt-online-installer-macOS-x64-4.8.0/qt-online-installer-macOS-x64-4.8.0.app/Contents/MacOS/qt-online-installer-macOS-x64-4.8.0 --no-force-installations --no-default-installations --no-size-checking --default-answer --accept-licenses --confirm-command --accept-obligations --email $QT_EMAIL --password $QT_PASSWORD install qt.tools.cmake qt.tools.ifw.48 qt.tools.ninja qt.qt6.672.clang_64 qt.qt6.672.qt5compat qt.qt6.672.debug_info qt.qt6.672.addons.qtpdf qt.qt6.672.addons.qthttpserver - hdiutil detach /Volumes/qt-online-installer-macOS-x64-4.8.0 + - install_qt_macos - run: name: Build command: |