diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 94e5f0a7..3f880752 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: config: - { name: "Linux", os: ubuntu-20.04 } - { name: "Windows", os: windows-latest } - - { name: "macOS", os: macos-13 } + - { name: "macOS", os: macos-14 } steps: - uses: actions/checkout@v4 diff --git a/setup.py b/setup.py index 88ada3df..63b9dc9f 100755 --- a/setup.py +++ b/setup.py @@ -11,7 +11,10 @@ import py7zr import requests import yaml -from tqdm_loggable.auto import tqdm +try: + from tqdm_loggable.auto import tqdm +except ModuleNotFoundError: + from tqdm import tqdm url_repo_qtc_fmt = "https://download.qt.io/{release_type}_releases/qtcreator/{qtcv_maj}/{qtcv_full}/installer_source/{os}_{arch}/" @@ -29,6 +32,7 @@ "i686": "x86", "x86": "x86", "x86_64": "x64", + "x64": "x64", "AMD64": "x64", "aarch64": "arm64", } @@ -225,6 +229,10 @@ def qt_download_check_extract(cfg, dir_install): cfg['os'] = platform.system() cfg['arch'] = platform.machine() + # macOS uses a universal binary that stores all architectures in the "x64" folder + if cfg['os'] == "Darwin": + cfg['arch'] = "x64" + with open("versions.yaml", 'r') as file: cfg['versions'] = yaml.safe_load(file)