diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 65ca427a13..d5b46485d3 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -27,9 +27,8 @@ jobs: - name: Install dependencies run: | - sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu bionic main universe' sudo apt-get -qq update - sudo apt-get install -y libftgl-dev freeglut3-dev libcurl4-openssl-dev libxmu-dev libxi-dev libfcgi-dev libxss-dev libnotify-dev libxcb-util0-dev libgtk2.0-dev libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev libwebkitgtk-dev p7zip-full libxxf86vm-dev ocl-icd-opencl-dev zip + sudo apt-get install -y libftgl-dev freeglut3-dev libcurl4-openssl-dev libxmu-dev libxi-dev libfcgi-dev libxss-dev libnotify-dev libxcb-util0-dev libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev libwebkit2gtk-4.0-dev p7zip-full libxxf86vm-dev ocl-icd-opencl-dev zip - name: Install dependencies for integration testing if: matrix.type == 'integration-test' diff --git a/3rdParty/buildLinuxDependencies.sh b/3rdParty/buildLinuxDependencies.sh index a713208cf0..c2c8ed8bdf 100755 --- a/3rdParty/buildLinuxDependencies.sh +++ b/3rdParty/buildLinuxDependencies.sh @@ -137,11 +137,12 @@ if [ "${doclean}" = "yes" ]; then echo ${build_config} >${PREFIX}/build-config fi +wx_ver="3.1.6" #download_and_build $DIRNAME $FILENAME $DOWNLOADURL $BUILDSCRIPT if [ "${gtest_only}" = "yes" ]; then download_and_build "googletest-release-1.8.1" "release-1.8.1.tar.gz" "https://github.com/google/googletest/archive/release-1.8.1.tar.gz" "${ROOTDIR}/3rdParty/buildGoogletestLinux.sh" else - download_and_build "wxWidgets-3.0.5" "wxWidgets-3.0.5.tar.bz2" "https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.5/wxWidgets-3.0.5.tar.bz2" "${ROOTDIR}/3rdParty/buildWxLinux.sh ${wxoption}" + download_and_build "wxWidgets-$wx_ver" "wxWidgets-$wx_ver.tar.bz2" "https://github.com/wxWidgets/wxWidgets/releases/download/v$wx_ver/wxWidgets-$wx_ver.tar.bz2" "${ROOTDIR}/3rdParty/buildWxLinux.sh ${wxoption}" fi # change back to root directory