Skip to content
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

add macOS 14 to CI #505

Merged
merged 3 commits into from
Jun 1, 2024
Merged

add macOS 14 to CI #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d19f57
switch to macOS 14 runners
christianrauch Jun 1, 2024
e5d7412
universal binary for macOS
christianrauch Jun 1, 2024
ff9cf3d
fall back to tqdm if tqdm-loggable is not available
christianrauch Jun 1, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 9 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}/"
Expand All @@ -29,6 +32,7 @@
"i686": "x86",
"x86": "x86",
"x86_64": "x64",
"x64": "x64",
"AMD64": "x64",
"aarch64": "arm64",
}
Expand Down Expand Up @@ -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)

Expand Down