From 25605b65a369263dfb9c1da15a80c6a8f53daee4 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Sat, 27 Feb 2021 01:39:04 +0000
Subject: [PATCH] Don't generate matrix assets on CircleCI (#3034)

We already do this in the buildkite pipeline, so doing so in CircleCI is just
duplicate work.
---
 .circleci/config.yml               | 7 -------
 scripts/generate-matrix-org-assets | 7 ++-----
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e3ac14d8..b629a018 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,12 +30,6 @@ checkexamples: &checkexamples
     source /env/bin/activate
     scripts/check-event-schema-examples.py
 
-genmatrixassets: &genmatrixassets
-  name: Generate/Verify matrix.org assets
-  command: |
-    source /env/bin/activate
-    ./scripts/generate-matrix-org-assets
-
 validateapi: &validateapi
   name: Validate OpenAPI specifications
   command: |
@@ -69,7 +63,6 @@ jobs:
     steps:
       - checkout
       - run: *checkexamples
-      - run: *genmatrixassets # We don't actually use the assets, but we do want to make sure they build
   build-docs:
     docker:
       - image: uhoreg/matrix-doc-build
diff --git a/scripts/generate-matrix-org-assets b/scripts/generate-matrix-org-assets
index 76032850..ed08f81d 100755
--- a/scripts/generate-matrix-org-assets
+++ b/scripts/generate-matrix-org-assets
@@ -8,11 +8,8 @@ cd `dirname $0`/..
 
 mkdir -p assets
 
-if [ "$CIRCLECI" != "true" ]
-then
-    # generate specification/proposals.rst
-    ./scripts/proposals.py
-fi
+# generate specification/proposals.rst
+./scripts/proposals.py
 
 # generate the spec docs
 ./scripts/gendoc.py -d assets/spec