From 26621234b4c38bbf2791337c63fe5a80b4c5f153 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Fri, 29 Oct 2021 11:51:31 +0100 Subject: [PATCH] remove unused buildkite pipeline (#1098) the buildkite build is archived --- .buildkite/pipeline.yaml | 84 ------------------- .github/workflows/build-matrix.org.yml | 3 +- {.buildkite => docker/build}/Dockerfile | 2 +- {.buildkite => docker}/gatsby/Dockerfile | 2 +- .../gatsby/package-lock.json | 0 {.buildkite => docker}/gatsby/package.json | 0 6 files changed, 4 insertions(+), 87 deletions(-) delete mode 100644 .buildkite/pipeline.yaml rename {.buildkite => docker/build}/Dockerfile (86%) rename {.buildkite => docker}/gatsby/Dockerfile (82%) rename {.buildkite => docker}/gatsby/package-lock.json (100%) rename {.buildkite => docker}/gatsby/package.json (100%) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml deleted file mode 100644 index d98992a0b..000000000 --- a/.buildkite/pipeline.yaml +++ /dev/null @@ -1,84 +0,0 @@ -steps: - # fetch the latest spec build, and apply styling to it. - # This step also sets up the swagger API. - - label: ":books: Spec" - plugins: - - docker#v3.0.1: - image: "python:3.6" - environment: - - "BUILDKITE_ACCESS_TOKEN" - command: - - python3 -m venv env - - env/bin/pip install requests - - ". env/bin/activate; scripts/update_docs.sh" - - tar -czf styled-docs.tar.gz content/docs - artifact_paths: - - styled-docs.tar.gz - - # Run jekyll. We run this in a custom docker image - see dockerfile in this directory. - - label: ":jekyll: jekyll" - plugins: - - docker#v3.0.1: - image: "matrixdotorg/matrixdotorg-build:0.2" - command: - # run jekyll to generate the rest of the site. - # This will generate stuff under ./jekyll/_site. - - . /env/bin/activate - - ./jekyll/generate.sh - - cp -rf ./pre-generated/* jekyll/_site/ - - tar -czf jekyll-site.tar.gz jekyll/_site - artifact_paths: - - jekyll-site.tar.gz - - # Run gatsby. We also use a custom docker image for this, to avoid - # installing the entirety of npmjs for each build. - - label: ":gatsby: gatsby" - plugins: - - docker#v3.0.1: - image: "matrixdotorg/matrixdotorg-gatsby:latest" - mount-checkout: false - volumes: - - "./gatsby:/workdir" - always_pull: true - commands: - - ln -s /opt/gatsby/node_modules . - - gatsby build - - tar -czf gatsby-site.tar.gz public - artifact_paths: - - gatsby/gatsby-site.tar.gz - - - label: ":books: Implementation Guides" - plugins: - - docker#v3.0.1: - image: "buildpack-deps" - commands: - - cd implementation-guides - - wget /~https://github.com/rust-lang/mdBook/releases/download/v0.4.1/mdbook-v0.4.1-x86_64-unknown-linux-gnu.tar.gz - - tar -xf mdbook-v0.4.1-x86_64-unknown-linux-gnu.tar.gz - - ./mdbook build server -d /workdir/implementation-guides/implementation-guides/server - - ./mdbook build client -d /workdir/implementation-guides/implementation-guides/client - - ./mdbook build application-services -d /workdir/implementation-guides/implementation-guides/application-services - - cp index.html /workdir/implementation-guides/implementation-guides/ - - tar -czf implementation-guides.tar.gz implementation-guides - artifact_paths: - - implementation-guides/implementation-guides.tar.gz - - - wait - - # Merge the three sets of outputs together, together - # with the existing static stuff in `content`. - - label: ":package: package" - command: - - buildkite-agent artifact download styled-docs.tar.gz . - - buildkite-agent artifact download jekyll-site.tar.gz . - - buildkite-agent artifact download gatsby/gatsby-site.tar.gz . - - buildkite-agent artifact download implementation-guides/implementation-guides.tar.gz . - - tar -xzvf styled-docs.tar.gz - - tar -xzvf jekyll-site.tar.gz - - cp -r jekyll/_site/{css,guides,howtos,projects} content/docs - - tar -C content --strip-components=1 -xzf gatsby/gatsby-site.tar.gz - - tar -C content -xzf implementation-guides/implementation-guides.tar.gz - - tar -czf content.tar.gz content - - free # debug for buildkite oom issue - artifact_paths: - - content.tar.gz diff --git a/.github/workflows/build-matrix.org.yml b/.github/workflows/build-matrix.org.yml index 4313152b4..ef1508a73 100644 --- a/.github/workflows/build-matrix.org.yml +++ b/.github/workflows/build-matrix.org.yml @@ -32,11 +32,11 @@ jobs: path: styled-docs.tar.gz # Run jekyll. We run this in a custom docker image. - # See dockerfile in the `.buildkite` directory. build-jekyll: name: "🌐 Jekyll" runs-on: ubuntu-latest container: + # the dockerfile for this is in matrix-org/docker/build image: "matrixdotorg/matrixdotorg-build:0.2" steps: - name: "📥 Source checkout" @@ -60,6 +60,7 @@ jobs: name: "🌐 Gatsby" runs-on: ubuntu-latest container: + # the dockerfile for this is in matrix-org/docker/gatsby image: "matrixdotorg/matrixdotorg-gatsby:latest" steps: - name: "📥 Source checkout" diff --git a/.buildkite/Dockerfile b/docker/build/Dockerfile similarity index 86% rename from .buildkite/Dockerfile rename to docker/build/Dockerfile index 3368ce172..64c4304c7 100644 --- a/.buildkite/Dockerfile +++ b/docker/build/Dockerfile @@ -1,6 +1,6 @@ # Dockerfile to construct the docker image used to construct the website # -# docker build .buildkite -f .buildkite/Dockerfile -t matrixdotorg/matrixdotorg-build +# docker build docker/build -t matrixdotorg/matrixdotorg-build # docker push matrixdotorg/matrixdotorg-build # 2.7 because the jekyll rst plugin expects it diff --git a/.buildkite/gatsby/Dockerfile b/docker/gatsby/Dockerfile similarity index 82% rename from .buildkite/gatsby/Dockerfile rename to docker/gatsby/Dockerfile index b7d0701a4..17d40dcbf 100644 --- a/.buildkite/gatsby/Dockerfile +++ b/docker/gatsby/Dockerfile @@ -1,6 +1,6 @@ # Dockerfile to construct the docker image used to construct the website # -# (cd .buildkite/gatsby; docker build . -t matrixdotorg/matrixdotorg-gatsby) +# docker build docker/gatsby -t matrixdotorg/matrixdotorg-gatsby # docker push matrixdotorg/matrixdotorg-gatsby FROM node:14 diff --git a/.buildkite/gatsby/package-lock.json b/docker/gatsby/package-lock.json similarity index 100% rename from .buildkite/gatsby/package-lock.json rename to docker/gatsby/package-lock.json diff --git a/.buildkite/gatsby/package.json b/docker/gatsby/package.json similarity index 100% rename from .buildkite/gatsby/package.json rename to docker/gatsby/package.json