ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2024-12-18 20:47:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

New attempt to fix CircleCI build

Browse Source
This commit is contained in:
grossmj 2021-02-27 16:24:47 +10:30
parent a101620954
commit d072324ef7
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.circleci/config.yml
View File

@ -86,8 +86,11 @@ jobs:
name: Building gns3server name: Building gns3server
command: | command: |
python3 -V python3 -V
pip3 install -r scripts/requirements.txt python3 -m pip install -U pip
python3 -m pip install -r scripts/requirements.txt
python3 scripts/build.py download -a python3 scripts/build.py download -a
# necessary because of https://github.com/GNS3/gns3-gui/issues/2849
python3 -m pip install jsonschema==2.6.0
python3 scripts/build.py build_exe -b dist/exe.gns3server -s python3 scripts/build.py build_exe -b dist/exe.gns3server -s
python3 scripts/build.py validate -b dist python3 scripts/build.py validate -b dist

8
scripts/build.py
View File

@ -144,7 +144,7 @@ def download_from_github(name, definition, output_directory):
files = [] files = []
if platform.system() == "Windows": if platform.system() == "Windows":
files = definition['files']['windows'] files = definition['files']['windows']
for filename in files: for filename in files:
dependency_file = os.path.join(dependency_dir, filename) dependency_file = os.path.join(dependency_dir, filename)
dependency_url = list(filter(lambda x: x['name'] == filename, release['assets']))[0]['browser_download_url'] dependency_url = list(filter(lambda x: x['name'] == filename, release['assets']))[0]['browser_download_url']
@ -161,7 +161,7 @@ def download_from_http(name, definition, output_directory):
files = [] files = []
if platform.system() == "Windows": if platform.system() == "Windows":
files = definition['files']['windows'] files = definition['files']['windows']
for filename in files: for filename in files:
dependency_file = os.path.join(dependency_dir, filename) dependency_file = os.path.join(dependency_dir, filename)
download(url, dependency_file) download(url, dependency_file)
@ -193,7 +193,7 @@ def is_tagged():
return True return True
if os.environ.get('APPVEYOR_REPO_TAG', False) in (1, "True", "true"): if os.environ.get('APPVEYOR_REPO_TAG', False) in (1, "True", "true"):
return True return True
def is_web_ui_non_dev(): def is_web_ui_non_dev():
package_file = os.path.join(FILE_DIR, '..', 'package.json') package_file = os.path.join(FILE_DIR, '..', 'package.json')
@ -237,6 +237,8 @@ def download_command(arguments):
if platform.system() == "Windows": if platform.system() == "Windows":
requirements = 'win-requirements.txt' requirements = 'win-requirements.txt'
elif platform.system() == "Darwin":
requirements = 'mac-requirements.txt'
else: else:
requirements = 'requirements.txt' requirements = 'requirements.txt'

10
scripts/requirements.txt
View File

@ -1,7 +1,5 @@
setuptools==19.2 setuptools==53.1.0
cx_Freeze==5.0.2 cx_Freeze==5.0.2
requests==2.23.0 requests==2.25.1
packaging==19.0 packaging==20.9
appdirs==1.4.3 appdirs==1.4.4
psutil==5.6.7
jsonschema==2.6.0 # lock down jsonschema, 3.0 makes problems