Explorar o código

Merge pull request #2983 from Alexander-Wilms/faster-ci

CI: Install all packages at once on Linux
Ivan Savenko %!s(int64=2) %!d(string=hai) anos
pai
achega
b919b3a2d1
Modificáronse 2 ficheiros con 10 adicións e 12 borrados
  1. 5 6
      CI/linux-qt6/before_install.sh
  2. 5 6
      CI/linux/before_install.sh

+ 5 - 6
CI/linux-qt6/before_install.sh

@@ -3,9 +3,8 @@
 sudo apt-get update
 
 # Dependencies
-sudo apt-get install libboost-all-dev
-sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev
-sudo apt-get install qt6-base-dev qt6-base-dev-tools qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools
-sudo apt-get install ninja-build zlib1g-dev libavformat-dev libswscale-dev libtbb-dev libluajit-5.1-dev
-# Optional dependencies
-sudo apt-get install libminizip-dev libfuzzylite-dev
+sudo apt-get install libboost-all-dev \
+libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev \
+qt6-base-dev qt6-base-dev-tools qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools \
+ninja-build zlib1g-dev libavformat-dev libswscale-dev libtbb-dev libluajit-5.1-dev \
+libminizip-dev libfuzzylite-dev # Optional dependencies

+ 5 - 6
CI/linux/before_install.sh

@@ -3,9 +3,8 @@
 sudo apt-get update
 
 # Dependencies
-sudo apt-get install libboost-all-dev
-sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev
-sudo apt-get install qtbase5-dev
-sudo apt-get install ninja-build zlib1g-dev libavformat-dev libswscale-dev libtbb-dev libluajit-5.1-dev
-# Optional dependencies
-sudo apt-get install libminizip-dev libfuzzylite-dev qttools5-dev
+sudo apt-get install libboost-all-dev \
+libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev \
+qtbase5-dev \
+ninja-build zlib1g-dev libavformat-dev libswscale-dev libtbb-dev libluajit-5.1-dev \
+libminizip-dev libfuzzylite-dev qttools5-dev # Optional dependencies