mirror of
https://github.com/element-hq/synapse.git
synced 2024-12-19 09:31:35 +03:00
Pin Rust to 1.82.0 when building Python wheels (#17993)
Addresses step 1 of #17988.
This commit is contained in:
parent
05d58b86ac
commit
45ca6392f4
3 changed files with 14 additions and 4 deletions
10
.github/workflows/release-artifacts.yml
vendored
10
.github/workflows/release-artifacts.yml
vendored
|
@ -5,7 +5,7 @@ name: Build release artifacts
|
||||||
on:
|
on:
|
||||||
# we build on PRs and develop to (hopefully) get early warning
|
# we build on PRs and develop to (hopefully) get early warning
|
||||||
# of things breaking (but only build one set of debs). PRs skip
|
# of things breaking (but only build one set of debs). PRs skip
|
||||||
# building wheels on ARM.
|
# building wheels on macOS & ARM.
|
||||||
pull_request:
|
pull_request:
|
||||||
push:
|
push:
|
||||||
branches: ["develop", "release-*"]
|
branches: ["develop", "release-*"]
|
||||||
|
@ -111,7 +111,7 @@ jobs:
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-22.04]
|
os: [ubuntu-22.04, macos-13]
|
||||||
arch: [x86_64, aarch64]
|
arch: [x86_64, aarch64]
|
||||||
# is_pr is a flag used to exclude certain jobs from the matrix on PRs.
|
# is_pr is a flag used to exclude certain jobs from the matrix on PRs.
|
||||||
# It is not read by the rest of the workflow.
|
# It is not read by the rest of the workflow.
|
||||||
|
@ -119,6 +119,12 @@ jobs:
|
||||||
- ${{ startsWith(github.ref, 'refs/pull/') }}
|
- ${{ startsWith(github.ref, 'refs/pull/') }}
|
||||||
|
|
||||||
exclude:
|
exclude:
|
||||||
|
# Don't build macos wheels on PR CI.
|
||||||
|
- is_pr: true
|
||||||
|
os: "macos-13"
|
||||||
|
# Don't build aarch64 wheels on mac.
|
||||||
|
- os: "macos-13"
|
||||||
|
arch: aarch64
|
||||||
# Don't build aarch64 wheels on PR CI.
|
# Don't build aarch64 wheels on PR CI.
|
||||||
- is_pr: true
|
- is_pr: true
|
||||||
arch: aarch64
|
arch: aarch64
|
||||||
|
|
1
changelog.d/17993.misc
Normal file
1
changelog.d/17993.misc
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Fix building wheels for MacOS which was temporarily disabled in Synapse 1.120.2.
|
|
@ -386,8 +386,11 @@ build-backend = "poetry.core.masonry.api"
|
||||||
# c.f. https://github.com/matrix-org/synapse/pull/14259
|
# c.f. https://github.com/matrix-org/synapse/pull/14259
|
||||||
skip = "cp36* cp37* cp38* pp37* pp38* *-musllinux_i686 pp*aarch64 *-musllinux_aarch64"
|
skip = "cp36* cp37* cp38* pp37* pp38* *-musllinux_i686 pp*aarch64 *-musllinux_aarch64"
|
||||||
|
|
||||||
# We need a rust compiler
|
# We need a rust compiler.
|
||||||
before-all = "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y --profile minimal"
|
#
|
||||||
|
# We temporarily pin Rust to 1.82.0 to work around
|
||||||
|
# https://github.com/element-hq/synapse/issues/17988
|
||||||
|
before-all = "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.82.0 -y --profile minimal"
|
||||||
environment= { PATH = "$PATH:$HOME/.cargo/bin" }
|
environment= { PATH = "$PATH:$HOME/.cargo/bin" }
|
||||||
|
|
||||||
# For some reason if we don't manually clean the build directory we
|
# For some reason if we don't manually clean the build directory we
|
||||||
|
|
Loading…
Reference in a new issue