diff options
| author | Amber H. Brown <hawkowl@atleastfornow.net> | 2019-07-17 04:28:11 +1000 |
|---|---|---|
| committer | Amber H. Brown <hawkowl@atleastfornow.net> | 2019-07-17 04:28:11 +1000 |
| commit | c43c1adb0c897556179db2a36d3969147408986c (patch) | |
| tree | d3d6fc26739b3b7c0a0b6c45483a7523020f45e1 | |
| parent | try now (diff) | |
| download | synapse-c43c1adb0c897556179db2a36d3969147408986c.tar.xz | |
fix
| -rw-r--r-- | .buildkite/pipeline.yml | 7 | ||||
| -rw-r--r-- | docker/Dockerfile-optimised | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index bda4675617..6b3eea1097 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -31,7 +31,7 @@ steps: - "python -m pip install tox" - "scripts-dev/check-newsfragment" label: ":newspaper: Newsfile" - branches: "!master !develop !release-*" + branches: "!master !develop !release-* !shhs-v*" plugins: - docker#v3.0.1: image: "python:3.6" @@ -137,6 +137,7 @@ steps: limit: 2 - label: ":python: 3.7 / :postgres: 9.5" + branches: "!shhs !shhs-*" env: TRIAL_FLAGS: "-j 4" command: @@ -233,14 +234,12 @@ steps: - exit_status: 2 limit: 2 - - wait - - label: "Docker Build -- Optimised Skylake-AVX512" agents: queue: "release" branches: "shhs-*" 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" artifact_paths: - "docker.tar.gz" \ No newline at end of file diff --git a/docker/Dockerfile-optimised b/docker/Dockerfile-optimised index cc6f37a9e1..e3af87b256 100644 --- a/docker/Dockerfile-optimised +++ b/docker/Dockerfile-optimised @@ -8,7 +8,7 @@ # There is an optional PYTHON_VERSION build argument which sets the # 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 |