diff --git a/.github/workflows/cmake_build.yml b/.github/workflows/cmake_build.yml index 8caa43302..0e4a57e6d 100644 --- a/.github/workflows/cmake_build.yml +++ b/.github/workflows/cmake_build.yml @@ -107,10 +107,35 @@ jobs: JFROG_ARTIFACTORY_NUGET_PASS: ${{secrets.JFROG_ARTIFACTORY_NUGET_PASS}} JFROG_ARTIFACTORY_NUGET_TOKEN: ${{secrets.JFROG_ARTIFACTORY_NUGET_TOKEN}} - - name: Install dependencies - if: runner.os != 'Windows' - run: | - exec bash "scripts/ci/dependencies.sh" + - name: "[Linux] Install dependencies" + if: runner.os == 'Linux' + run: >- + sudo apt-get update && + sudo apt-get install -y --no-install-recommends + file + g++ + ninja-build + nasm + git + wget + bash + scdoc + ccache + debhelper-compat + gettext + libasound2-dev + libgtk-3-dev + libsuil-dev + gettext + + - name: "[MacOS] Install dependencies" + if: runner.os == 'macOS' + run: >- + brew install + bash + ccache + ninja + nasm - name: "[Windows] Install dependencies" if: runner.os == 'Windows' diff --git a/scripts/ci/dependencies.sh b/scripts/ci/dependencies.sh deleted file mode 100755 index 32cab80d8..000000000 --- a/scripts/ci/dependencies.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env bash - -((${BASH_VERSION%%.*} >= 4)) || echo >&2 "$0: Warning: Using ancient Bash version ${BASH_VERSION}." - -set -euxo pipefail - -if [[ "${OSTYPE}" == darwin* ]]; then # macOS - - # Homebrew packages - brew_packages=( - bash # macOS ships with Bash v3 for licensing reasons so upgrade it now - ccache - ninja - - # needed to build ffmpeg - nasm - ) - brew install "${brew_packages[@]}" - -else # Linux & others - - if ! which sudo; then - function sudo() { "$@"; } # no-op sudo for use in Docker images - fi - - # Distribution packages - if which apt-get; then - apt_packages=( - # Build tools - file - g++ - ninja-build - nasm - git - wget - bash - scdoc - ccache - - # Dependencies - debhelper-compat - gettext - libasound2-dev - libgtk-3-dev - libsuil-dev - - # GitHub Actions - gettext - ) - sudo apt-get update -y - sudo apt-get install -y --no-install-recommends "${apt_packages[@]}" - else - echo >&2 "$0: Error: You don't have a recognized package manager installed." - exit 1 - fi -fi