From 617514cf9da4d444c285ebb27ff1c7fd034a484f Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Fri, 20 May 2022 22:24:41 +0200
Subject: Adapt update-api target to matrix-doc split

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b704b3b9..9b9383db 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -179,11 +179,11 @@ jobs:
       if: matrix.update-api
       working-directory: ${{ runner.workspace }}
       run: |
-        git clone https://github.com/matrix-org/matrix-doc.git
+        git clone https://github.com/quotient-im/matrix-spec.git
         git clone --recursive https://github.com/KitsuneRal/gtad.git
         cmake -S gtad -B build/gtad $CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF
         cmake --build build/gtad
-        echo "CMAKE_ARGS=$CMAKE_ARGS -DMATRIX_DOC_PATH=${{ runner.workspace }}/matrix-doc \
+        echo "CMAKE_ARGS=$CMAKE_ARGS -DMATRIX_SPEC_PATH=${{ runner.workspace }}/matrix-spec \
                                      -DGTAD_PATH=${{ runner.workspace }}/build/gtad/gtad" \
              >>$GITHUB_ENV
         echo "QUOTEST_ORIGIN=$QUOTEST_ORIGIN with API files regeneration" >>$GITHUB_ENV
-- 
cgit v1.2.3


From 4e127d5f74c56b1e366de3e8afb7f07700a566b4 Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Sat, 21 May 2022 16:29:00 +0200
Subject: Use branch of matrix-spec

---
 .github/workflows/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

(limited to '.github/workflows')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9b9383db..bea9f436 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -180,6 +180,9 @@ jobs:
       working-directory: ${{ runner.workspace }}
       run: |
         git clone https://github.com/quotient-im/matrix-spec.git
+        pushd matrix-spec
+        git checkout fixcompilation
+        popd
         git clone --recursive https://github.com/KitsuneRal/gtad.git
         cmake -S gtad -B build/gtad $CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF
         cmake --build build/gtad
-- 
cgit v1.2.3


From 3c6ca3c89d7b1a972d50ec4eb0b42ab350771f72 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Tue, 31 May 2022 17:36:17 +0200
Subject: Update gtad.yml to match v3 API definitions

Also: use quotient-im/matrix-spec main branch again, now that it has
adjusted definitions; drop un(der)used partials
---
 .github/workflows/ci.yml |  3 ---
 gtad/gtad.yaml           | 17 +++++------------
 2 files changed, 5 insertions(+), 15 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bea9f436..9b9383db 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -180,9 +180,6 @@ jobs:
       working-directory: ${{ runner.workspace }}
       run: |
         git clone https://github.com/quotient-im/matrix-spec.git
-        pushd matrix-spec
-        git checkout fixcompilation
-        popd
         git clone --recursive https://github.com/KitsuneRal/gtad.git
         cmake -S gtad -B build/gtad $CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF
         cmake --build build/gtad
diff --git a/gtad/gtad.yaml b/gtad/gtad.yaml
index 03c23886..e8d4ba35 100644
--- a/gtad/gtad.yaml
+++ b/gtad/gtad.yaml
@@ -85,9 +85,8 @@ analyzer:
           imports: '"events/eventloader.h"'
         +on:
         - /state_event.yaml$/: StateEventPtr
-        - /room_event.yaml$/: RoomEventPtr
-        - /event.yaml$/: EventPtr
-      - /m\.room\.member/: void # Skip resolving; see EventsArray<> below
+        - /(room|client)_event.yaml$/: RoomEventPtr
+        - /event(_without_room_id)?.yaml$/: EventPtr
       - +set:
           # This renderer actually applies to all $ref things
           _importRenderer: '"{{#segments}}{{_}}{{#_join}}/{{/_join}}{{/segments}}.h"'
@@ -115,12 +114,9 @@ analyzer:
         - /^Notification|Result$/:
             type: "std::vector<{{1}}>"
             imports: '"events/eventloader.h"'
-        - /m\.room\.member/: # Only used in an array (see also above)
-            type: "EventsArray<RoomMemberEvent>"
-            imports: '"events/roommemberevent.h"'
         - /state_event.yaml$/: StateEvents
-        - /room_event.yaml$/: RoomEvents
-        - /event.yaml$/: Events
+        - /(room|client)_event.yaml$/: RoomEvents
+        - /event(_without_room_id)?.yaml$/: Events
       - //: "QVector<{{1}}>"
     - map: # `additionalProperties` in OpenAPI
       - RoomState:
@@ -164,11 +160,8 @@ mustache:
     qualifiedMaybeOmittableType:
       "{{>openOmittable}}{{dataType.qualifiedName}}{{>closeOmittable}}"
 
-    ref: "{{#avoidCopy}}&{{/avoidCopy}}{{#moveOnly}}&&{{/moveOnly}}"
     maybeCrefType:
-      "{{#avoidCopy}}const {{/avoidCopy}}{{>maybeOmittableType}}{{>ref}}"
-    qualifiedMaybeCrefType:
-      "{{#avoidCopy}}const {{/avoidCopy}}{{>qualifiedMaybeOmittableType}}{{>ref}}"
+      "{{#avoidCopy}}const {{/avoidCopy}}{{>maybeOmittableType}}{{#avoidCopy}}&{{/avoidCopy}}"
 
     maybeCrefJsonObject:
       "{{^propertyMap}}const QJsonObject&{{/propertyMap}}\
-- 
cgit v1.2.3