mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 19:29:47 +02:00
Fix distro module for Linux
This commit is contained in:
parent
927bb1985f
commit
a1df2208de
2 changed files with 2 additions and 2 deletions
2
.github/workflows/pr_build.yml
vendored
2
.github/workflows/pr_build.yml
vendored
|
@ -120,7 +120,7 @@ jobs:
|
||||||
run: sudo apt install -y mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0
|
run: sudo apt install -y mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0
|
||||||
- name: Install python modules
|
- name: Install python modules
|
||||||
shell: bash
|
shell: bash
|
||||||
run: pip install boto3 PyGithub
|
run: pip install boto3 distro PyGithub
|
||||||
- name: Create Build Environment
|
- name: Create Build Environment
|
||||||
run: cmake -E make_directory ${{runner.workspace}}/build
|
run: cmake -E make_directory ${{runner.workspace}}/build
|
||||||
- name: Configure CMake
|
- name: Configure CMake
|
||||||
|
|
|
@ -9,7 +9,6 @@ import tempfile
|
||||||
import json
|
import json
|
||||||
import xml.etree.ElementTree as ET
|
import xml.etree.ElementTree as ET
|
||||||
import functools
|
import functools
|
||||||
import distro
|
|
||||||
|
|
||||||
print = functools.partial(print, flush=True)
|
print = functools.partial(print, flush=True)
|
||||||
|
|
||||||
|
@ -60,6 +59,7 @@ endif()
|
||||||
elif 'Darwin' == system:
|
elif 'Darwin' == system:
|
||||||
self.qtUrl = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-macos.tar.gz?versionId=bLAgnoJ8IMKpqv8NFDcAu8hsyQy3Rwwz'
|
self.qtUrl = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-macos.tar.gz?versionId=bLAgnoJ8IMKpqv8NFDcAu8hsyQy3Rwwz'
|
||||||
elif 'Linux' == system:
|
elif 'Linux' == system:
|
||||||
|
import distro
|
||||||
dist = distro.linux_distribution()
|
dist = distro.linux_distribution()
|
||||||
|
|
||||||
if distro.id() == 'ubuntu':
|
if distro.id() == 'ubuntu':
|
||||||
|
|
Loading…
Reference in a new issue