From a1df2208de7981800c7f138c2991025dea7f2690 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sun, 12 Apr 2020 13:58:36 +1200 Subject: [PATCH] Fix distro module for Linux --- .github/workflows/pr_build.yml | 2 +- hifi_qt.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index b90062f75b..d1ecb1bb02 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -120,7 +120,7 @@ jobs: run: sudo apt install -y mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0 - name: Install python modules shell: bash - run: pip install boto3 PyGithub + run: pip install boto3 distro PyGithub - name: Create Build Environment run: cmake -E make_directory ${{runner.workspace}}/build - name: Configure CMake diff --git a/hifi_qt.py b/hifi_qt.py index bfde8e5532..504793e25c 100644 --- a/hifi_qt.py +++ b/hifi_qt.py @@ -9,7 +9,6 @@ import tempfile import json import xml.etree.ElementTree as ET import functools -import distro print = functools.partial(print, flush=True) @@ -60,6 +59,7 @@ endif() elif 'Darwin' == system: self.qtUrl = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-macos.tar.gz?versionId=bLAgnoJ8IMKpqv8NFDcAu8hsyQy3Rwwz' elif 'Linux' == system: + import distro dist = distro.linux_distribution() if distro.id() == 'ubuntu':