Skip to content

Commit 93fe017

Browse files
committed
[wayland-mesa] drop apt-file and full apt upgrade to speed up CI setup
The ubuntu pre-requisites installed apt-file, which is never used but makes the subsequent `apt update` also pull the package Contents indices (~640 MB on jammy: jammy-updates 299 MB + jammy-security 291 MB). It also ran a full `apt upgrade` (a dist-upgrade of an already-current GitHub-hosted runner). Both are avoidable -- the named dev packages install fine against the base indices. Removing them cuts several minutes off every job that loads the wayland-mesa dependency (e.g. ivi-homescreen's crash-handler: ~11 min, ~5 of it apt setup). The kisak-mesa PPA is kept so the Mesa version is unchanged for jobs that actually run graphics. Refs #180. Signed-off-by: Joel Winarske <joel.winarske@gmail.com>
1 parent 2f02979 commit 93fe017

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

configs/wayland-mesa.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
"ubuntu": {
1818
"shell": true,
1919
"cmds": [
20-
"sudo-apt-workspace install -yq lsb-release wget software-properties-common gnupg apt-file build-essential libtool",
20+
"sudo-apt-workspace install -yq lsb-release wget software-properties-common gnupg build-essential libtool",
2121
"sudo add-apt-repository -y ppa:kisak/kisak-mesa",
2222
"sudo-apt-workspace update -yq",
23-
"if [ \"$CI\" = \"true\" ]; then sudo-apt-workspace upgrade -yq --fix-missing || sudo-apt-workspace upgrade -yq -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" || echo 'Upgrade completed with some errors - continuing'; else sudo-apt-workspace upgrade -yq; fi",
2423
"sudo-apt-workspace install -yq libxkbcommon-dev libwayland-dev wayland-protocols mesa-common-dev libegl1-mesa-dev libgles2-mesa-dev mesa-utils libsecret-1-dev libsdl2-dev libjpeg-dev zenity"
2524
]
2625
},
@@ -37,10 +36,9 @@
3736
"ubuntu": {
3837
"shell": true,
3938
"cmds": [
40-
"sudo-apt-workspace install -yq lsb-release wget software-properties-common gnupg apt-file build-essential libtool",
39+
"sudo-apt-workspace install -yq lsb-release wget software-properties-common gnupg build-essential libtool",
4140
"sudo add-apt-repository -y ppa:kisak/kisak-mesa",
4241
"sudo-apt-workspace update -yq",
43-
"if [ \"$CI\" = \"true\" ]; then sudo-apt-workspace upgrade -yq --fix-missing || sudo-apt-workspace upgrade -yq -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" || echo 'Upgrade completed with some errors - continuing'; else sudo-apt-workspace upgrade -yq; fi",
4442
"sudo-apt-workspace install -yq libxkbcommon-dev libwayland-dev wayland-protocols mesa-common-dev libegl1-mesa-dev libgles2-mesa-dev mesa-utils libsecret-1-dev libsdl2-dev libjpeg-dev zenity"
4543
]
4644
},

0 commit comments

Comments
 (0)