mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-22 12:44:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
Amber H. Brown 2019-07-17 04:28:11 +10:00
parent a025abebe8
commit c43c1adb0c
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.buildkite/pipeline.yml
View file

@ -31,7 +31,7 @@ steps:
- "python -m pip install tox" - "python -m pip install tox"
- "scripts-dev/check-newsfragment" - "scripts-dev/check-newsfragment"
label: ":newspaper: Newsfile" label: ":newspaper: Newsfile"
branches: "!master !develop !release-*" branches: "!master !develop !release-* !shhs-v*"
plugins: plugins:
- docker#v3.0.1: - docker#v3.0.1:
image: "python:3.6" image: "python:3.6"
@ -137,6 +137,7 @@ steps:
limit: 2 limit: 2
- label: ":python: 3.7 / :postgres: 9.5" - label: ":python: 3.7 / :postgres: 9.5"
branches: "!shhs !shhs-*"
env: env:
TRIAL_FLAGS: "-j 4" TRIAL_FLAGS: "-j 4"
command: command:
@ -233,14 +234,12 @@ steps:
- exit_status: 2 - exit_status: 2
limit: 2 limit: 2
- wait
- label: "Docker Build -- Optimised Skylake-AVX512" - label: "Docker Build -- Optimised Skylake-AVX512"
agents: agents:
queue: "release" queue: "release"
branches: "shhs-*" branches: "shhs-*"
command: command:
- "docker build -f docker/Dockerfile-optimised --build-arg PYTHON_VERSION=3.6 --build-arg MARCH=skylake-avx512 . -t matrixdotorg/synapse:${BUILDKITE_TAG}-skylake-avx512" - "docker build -f docker/Dockerfile-optimised --build-arg PYTHON_VERSION=3.7.4 --build-arg MARCH=skylake-avx512 . -t matrixdotorg/synapse:${BUILDKITE_TAG}-skylake-avx512"
- "docker docker save matrixdotorg/synapse:${BUILDKITE_TAG}-skylake-avx512 | gzip -9 > docker.tar.gz" - "docker docker save matrixdotorg/synapse:${BUILDKITE_TAG}-skylake-avx512 | gzip -9 > docker.tar.gz"
artifact_paths: artifact_paths:
- "docker.tar.gz" - "docker.tar.gz"

2
docker/Dockerfile-optimised
View file

@ -8,7 +8,7 @@
# There is an optional PYTHON_VERSION build argument which sets the # There is an optional PYTHON_VERSION build argument which sets the
# version of python to build against: for example: # version of python to build against: for example:
# #
# docker build -f docker/Dockerfile --build-arg PYTHON_VERSION=3.6 . # docker build -f docker/Dockerfile --build-arg PYTHON_VERSION=3.6 --build-arg MARCH=skylake-avx512 .
# #
ARG PYTHON_VERSION=3.7.4 ARG PYTHON_VERSION=3.7.4