File tree Expand file tree Collapse file tree 3 files changed +14
-4
lines changed Expand file tree Collapse file tree 3 files changed +14
-4
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ name: Build release artifacts
5
5
on :
6
6
# we build on PRs and develop to (hopefully) get early warning
7
7
# of things breaking (but only build one set of debs). PRs skip
8
- # building wheels on ARM.
8
+ # building wheels on macOS & ARM.
9
9
pull_request :
10
10
push :
11
11
branches : ["develop", "release-*"]
@@ -111,14 +111,20 @@ jobs:
111
111
runs-on : ${{ matrix.os }}
112
112
strategy :
113
113
matrix :
114
- os : [ubuntu-22.04]
114
+ os : [ubuntu-22.04, macos-13 ]
115
115
arch : [x86_64, aarch64]
116
116
# is_pr is a flag used to exclude certain jobs from the matrix on PRs.
117
117
# It is not read by the rest of the workflow.
118
118
is_pr :
119
119
- ${{ startsWith(github.ref, 'refs/pull/') }}
120
120
121
121
exclude :
122
+ # Don't build macos wheels on PR CI.
123
+ - is_pr : true
124
+ os : " macos-13"
125
+ # Don't build aarch64 wheels on mac.
126
+ - os : " macos-13"
127
+ arch : aarch64
122
128
# Don't build aarch64 wheels on PR CI.
123
129
- is_pr : true
124
130
arch : aarch64
Original file line number Diff line number Diff line change
1
+ Fix building wheels for MacOS which was temporarily disabled in Synapse 1.120.2.
Original file line number Diff line number Diff line change @@ -386,8 +386,11 @@ build-backend = "poetry.core.masonry.api"
386
386
# c.f. https://github.com/matrix-org/synapse/pull/14259
387
387
skip = " cp36* cp37* cp38* pp37* pp38* *-musllinux_i686 pp*aarch64 *-musllinux_aarch64"
388
388
389
- # We need a rust compiler
390
- before-all = " curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y --profile minimal"
389
+ # We need a rust compiler.
390
+ #
391
+ # We temporarily pin Rust to 1.82.0 to work around
392
+ # https://github.com/element-hq/synapse/issues/17988
393
+ before-all = " curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.82.0 -y --profile minimal"
391
394
environment = { PATH = " $PATH:$HOME/.cargo/bin" }
392
395
393
396
# For some reason if we don't manually clean the build directory we
You can’t perform that action at this time.
0 commit comments