Merge pull request #1563 from turt2live/travis/general/fix-build-1

Ensure the event examples and matrix.org assets are tested

.circleci/config.yml

@@ -23,9 +23,29 @@ buildswaggerui: &buildswaggerui
     wget https://raw.githubusercontent.com/matrix-org/matrix.org/master/scripts/swagger-ui.patch
     patch api/client-server/index.html swagger-ui.patch
 
+checkexamples: &checkexamples
+  name: Check Event Examples
+  command: |
+    source /env/bin/activate
+    cd event-schemas
+    ./check_examples.py
+
+genmatrixassets: &genmatrixassets
+  name: Generate/Verify matrix.org assets
+  command: |
+    source /env/bin/activate
+    ./scripts/generate-matrix-org-assets
+
 
 version: 2
 jobs:
+  check-docs:
+    docker:
+      - image: uhoreg/matrix-doc-build
+    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

event-schemas/schema/m.room.encrypted

@@ -13,8 +13,8 @@ properties:
       algorithm:
         type: string
         enum:
-          - m.olm.curve25519-aes-sha256
+          - m.olm.v1.curve25519-aes-sha2
-          - m.megolm.v1.aes-sha
+          - m.megolm.v1.aes-sha2
         description: |-
           The encryption algorithm used to encrypt this event. The
           value of this field determines which other properties will be