这是indexloc提供的服务，不要输入任何密码
Skip to content

Upgrade Linux builds to Xenial and Qt 5.15 #1635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 9, 2021
Merged

Upgrade Linux builds to Xenial and Qt 5.15 #1635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions .github/actions/install-dependencies/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@
setup_linux() {
# Because of how bare-bones our docker image is
echo "::group::Install prerequisites"
sudo apt-get -yq install software-properties-common
apt-get -yq install software-properties-common
echo "::endgroup::"

echo "::group::Add APT sources"
for ppa in ppa:ubuntu-toolchain-r/test ppa:ubuntu-sdk-team/ppa \
ppa:git-core/ppa ppa:mc3man/trusty-media \
ppa:beineri/opt-qt597-trusty; do
sudo apt-add-repository -y "${ppa}"
ppa:git-core/ppa ppa:beineri/opt-qt-5.15.2-xenial; do
apt-add-repository -y "${ppa}"
done
echo "::endgroup::"

echo "::group::Fetch APT updates"
sudo apt-get update -yq
apt-get update -yq
echo "::endgroup::"

echo "::group::Install APT packages"
sudo apt-get install -yq --no-install-suggests --no-install-recommends \
build-essential qt59tools qt59base qt59multimedia qt59svg qt59xmlpatterns \
libgl1-mesa-dev bsdtar ffmpeg gstreamer1.0-plugins-base \
gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa \
gstreamer1.0-pulseaudio git curl libfuse2 python3 python3-pip
apt-get install -yq --no-install-suggests --no-install-recommends \
build-essential qt515tools qt515base qt515multimedia qt515svg \
qt515xmlpatterns libgl1-mesa-dev bsdtar ffmpeg gstreamer1.0-plugins-base \
gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \
gstreamer1.0-plugins-ugly gstreamer1.0-alsa gstreamer1.0-pulseaudio git \
curl libfuse2 python3 python3-pip
echo "::endgroup::"

echo "::group::Install Python packages"
sudo pip3 install --upgrade oauth2client google-api-python-client typing 'setuptools<44'
pip3 install --upgrade oauth2client google-api-python-client typing 'setuptools<44'
echo "::endgroup::"
}

Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-environment/setup-environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ setup_linux() {
# Our container image uses the non-Unicode C locale by default
echo "LANG=C.UTF-8" >> "${GITHUB_ENV}"
# Set up Qt environment variables and export them to the GitHub Actions workflow
(printenv; (. /opt/qt59/bin/qt59-env.sh; printenv)) | sort -st= -k1,1 | uniq -u >> "${GITHUB_ENV}"
(printenv; (. /opt/qt515/bin/qt515-env.sh; printenv)) | sort -st= -k1,1 | uniq -u >> "${GITHUB_ENV}"
}

setup_macos() {
echo "MAKEFLAGS=-j2" >> "${GITHUB_ENV}"
echo "MAKEFLAGS=-j3" >> "${GITHUB_ENV}"
}

setup_windows() {
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
# XXX: --privileged is sort of a brute-force solution to get FUSE
# working inside Docker, however so far I haven’t been able to
# figure out precisely *which* privileges are needed.
container: { image: "ubuntu:14.04", options: --privileged }
container: { image: "ubuntu:16.04", options: --privileged }
upload-parent: linux_x86_64_parent
- name: macOS x86_64
os: macos-10.15
Expand All @@ -56,10 +56,11 @@ jobs:
# container image does not
if: runner.os == 'Linux'
run: |
sudo apt-get -yq install software-properties-common
sudo apt-add-repository -y ppa:git-core/ppa
sudo apt-get update -yq
sudo apt-get install -yq --no-install-suggests --no-install-recommends git
apt-get update -yq
apt-get -yq install software-properties-common
apt-add-repository -y ppa:git-core/ppa
apt-get update -yq
apt-get install -yq --no-install-suggests --no-install-recommends git
- name: Check out repository
uses: actions/checkout@v2
- name: Install Qt (Windows)
Expand Down
1 change: 1 addition & 0 deletions app/src/checkupdatesdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ GNU General Public License for more details.
*/

#include "checkupdatesdialog.h"
#include <QDebug>
#include <QNetworkReply>
#include <QNetworkAccessManager>
#include <QHBoxLayout>
Expand Down