Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit21ee2d0

Browse files
committed
Build separate Apple Silicon release
With GitHub Actions now providing macOS 14 runners with M1 chips, we canbuild a separate Apple Silicon release there and upload it.Universal wheels are currently not possible, see#8229 for details.Closes#6478(cherry picked from commit27164d0)
1 parent06f77d1 commit21ee2d0

File tree

5 files changed

+31
-3
lines changed

5 files changed

+31
-3
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,11 @@ jobs:
183183
os:macos-12
184184
python:"3.12"
185185
args:"tests/unit"# Only run unit tests on macOS
186+
### macOS Sonoma (M1 runner)
187+
-testenv:py312-pyqt67
188+
os:macos-14
189+
python:"3.12"
190+
args:"tests/unit"# Only run unit tests on macOS
186191
### Windows
187192
-testenv:py312-pyqt67
188193
os:windows-2019

‎.github/workflows/nightly.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,20 @@ jobs:
3030
name:qt5-windows-debug
3131
-os:macos-11
3232
toxenv:build-release
33-
name:macos
33+
name:macos-intel
34+
-os:macos-14
35+
toxenv:build-release
36+
name:macos-apple-silicon
3437
-os:windows-2019
3538
toxenv:build-release
3639
name:windows
3740
-os:macos-11
3841
args:--debug
3942
toxenv:build-release
40-
name:macos-debug
43+
name:macos-debug-intel
44+
-os:macos-14
45+
toxenv:build-release
46+
name:macos-debug-apple-silicon
4147
-os:windows-2019
4248
args:--debug
4349
toxenv:build-release

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ jobs:
127127
matrix:
128128
include:
129129
-os:macos-11
130+
-os:macos-14
130131
-os:windows-2019
131132
-os:ubuntu-20.04
132133
runs-on:"${{ matrix.os }}"

‎doc/changelog.asciidoc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@ breaking changes (such as renamed commands) can happen in minor releases.
1515
// `Fixed` for any bug fixes.
1616
// `Security` to invite users to upgrade in case of vulnerabilities.
1717

18+
[[v3.3.0]]
19+
v3.3.0 (unreleased)
20+
-------------------
21+
22+
Added
23+
~~~~~
24+
25+
- There is now a separate macOS release built for Apple Silicon. A Universal
26+
Binary might follow with a later release.
27+
1828
[[v3.2.1]]
1929
v3.2.1 (unreleased)
2030
-------------------

‎scripts/dev/build_release.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
importargparse
1717
importtarfile
1818
importtempfile
19+
importplatform
1920
importcollections
2021
importdataclasses
2122
importre
@@ -301,8 +302,10 @@ def build_mac(
301302
dmg_makefile_path=REPO_ROOT/"scripts"/"dev"/"Makefile-dmg"
302303
subprocess.run(['make','-f',dmg_makefile_path],check=True)
303304

305+
arch=platform.machine()
304306
suffix="-debug"ifdebugelse""
305307
suffix+="-qt5"ifqt5else""
308+
suffix+=f"-{arch}"
306309
dmg_path=dist_path/f'qutebrowser-{qutebrowser.__version__}{suffix}.dmg'
307310
pathlib.Path('qutebrowser.dmg').rename(dmg_path)
308311

@@ -322,11 +325,14 @@ def build_mac(
322325
exceptPermissionErrorase:
323326
print(f"Failed to remove tempdir:{e}")
324327

328+
arch_to_desc= {"x86_64":"Intel","arm64":"Apple Silicon"}
329+
desc_arch=arch_to_desc[arch]
330+
325331
return [
326332
Artifact(
327333
path=dmg_path,
328334
mimetype='application/x-apple-diskimage',
329-
description='macOS .dmg'
335+
description=f'macOS .dmg ({desc_arch})'
330336
)
331337
]
332338

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp