Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ jobs:
restore-keys: ${{runner.os}}-${{runner.arch}}-ccache-
- name: Setup ccache
run: |
sudo apt-get update && sudo apt-get install -y ccache
sudo apt-get install -y ccache
bash ./buildscripts/ci/tools/setup_ccache_config.sh

- name: Install Qt
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build_linux_arm32.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ jobs:
uses: actions/checkout@v6
- name: Setup QEMU
run: |
sudo apt-get update
sudo apt-get install qemu-user-static -y
- name: Configure workflow
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
restore-keys: wasm-ccache-
- name: Setup ccache
run: |
sudo apt-get update && sudo apt-get install -y ccache
sudo apt-get install -y ccache
bash ./buildscripts/ci/tools/setup_ccache_config.sh

- name: Install Qt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
${{runner.os}}-${{runner.arch}}-utests-ccache-
- name: Setup ccache
run: |
sudo apt-get update && sudo apt-get install -y ccache
sudo apt-get install -y ccache
bash ./buildscripts/ci/tools/setup_ccache_config.sh

- name: Free up disk space
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check_visual_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
${{runner.os}}-${{runner.arch}}-vtests-reference-ccache-
- name: Setup ccache
run: |
sudo apt-get update && sudo apt-get install -y ccache
sudo apt-get install -y ccache
bash ./buildscripts/ci/tools/setup_ccache_config.sh

- name: Install Qt
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
${{runner.os}}-${{runner.arch}}-vtests-current-ccache-
- name: Setup ccache
run: |
sudo apt-get update && sudo apt-get install -y ccache
sudo apt-get install -y ccache
bash ./buildscripts/ci/tools/setup_ccache_config.sh

- name: Install Qt
Expand Down
74 changes: 17 additions & 57 deletions buildscripts/ci/linux/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,65 +59,25 @@ fi
# GET DEPENDENCIES
##########################################################################

apt_packages=(
coreutils
apt_packages_tools=(
# Alphabetical order please!
curl
desktop-file-utils # installs `desktop-file-validate` for appimagetool
gawk
git
lcov
libasound2-dev
libcups2-dev
libfontconfig1-dev
libfreetype6-dev
libgcrypt20-dev
libgl1-mesa-dev
libglib2.0-dev
libgpgme-dev # install for appimagetool
libjack-dev
libnss3-dev
libportmidi-dev
libpulse-dev
librsvg2-dev
libsndfile1-dev
libssl-dev
libtool
make
p7zip-full
sed
software-properties-common # installs `add-apt-repository`
unzip
wget
zsync # installs `zsyncmake` for appimagetool
)

# MuseScore compiles without these but won't run without them
apt_packages_runtime=(
# Alphabetical order please!
libdbus-1-3
libegl1-mesa-dev
libgles2-mesa-dev
libodbc2
libpq-dev
libssl-dev
libxcomposite-dev
libxcursor-dev
libxi-dev
libxkbcommon-x11-0
libxrandr2
libxtst-dev
libdrm-dev
libxcb-icccm4
libxcb-image0
libxcb-keysyms1
libxcb-randr0
libxcb-render-util0
libxcb-xinerama0
libxcb-xkb-dev
libxkbcommon-dev
libopengl-dev
# Qt dependencies are already installed by the "Install Qt" step
apt_packages_deps=(
libasound2-dev
libcups2-dev
libsndfile1-dev
libvulkan-dev
)
)

apt_packages_ffmpeg=(
ffmpeg
Expand All @@ -126,17 +86,17 @@ apt_packages_ffmpeg=(
libswscale-dev
)

apt_packages_pw_deps=(
libdbus-1-dev
libudev-dev
)
if $BUILD_PIPEWIRE ; then
apt_packages_deps+=(
libdbus-1-dev
libudev-dev
)
fi

$SUDO apt-get update
$SUDO apt-get install -y --no-install-recommends \
"${apt_packages[@]}" \
"${apt_packages_runtime[@]}" \
"${apt_packages_ffmpeg[@]}" \
"${apt_packages_pw_deps[@]}"
"${apt_packages_tools[@]}" \
"${apt_packages_deps[@]}" \
"${apt_packages_ffmpeg[@]}"

##########################################################################
# GET TOOLS
Expand Down
57 changes: 4 additions & 53 deletions buildscripts/ci/withoutqt/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,64 +41,15 @@ echo "echo 'Setup MuseScore build environment'" >> $ENV_FILE
# GET DEPENDENCIES
##########################################################################

# DISTRIBUTION PACKAGES

# These are installed by default on Travis CI, but not on Docker
apt_packages_basic=(
# Alphabetical order please!
file
git
software-properties-common # installs `add-apt-repository`
unzip
p7zip-full
)

# These are the same as on Travis CI
apt_packages_standard=(
apt_packages=(
# Alphabetical order please!
curl
libasound2-dev
libfontconfig1-dev
libfreetype6-dev
libfreetype6
libgl1-mesa-dev
libjack-dev
libnss3-dev
libportmidi-dev
libpulse-dev
libsndfile1-dev
make
p7zip-full
unzip
wget
)

# MuseScore compiles without these but won't run without them
apt_packages_runtime=(
# Alphabetical order please!
libcups2
libdbus-1-3
libegl1-mesa-dev
libodbc1
libpq-dev
libxcomposite-dev
libxcursor-dev
libxi-dev
libxkbcommon-x11-0
libxrandr2
libxtst-dev
libdrm-dev
libxcb-icccm4
libxcb-image0
libxcb-keysyms1
libxcb-randr0
libxcb-render-util0
libxcb-xinerama0
)

sudo apt-get update # no package lists in Docker image
sudo apt-get install -y --no-install-recommends \
"${apt_packages_basic[@]}" \
"${apt_packages_standard[@]}" \
"${apt_packages_runtime[@]}"
sudo apt-get install -y --no-install-recommends "${apt_packages[@]}"


##########################################################################
Expand Down
Loading