diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-06-07 22:53:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-07 22:53:42 +0200 |
| commit | c566c94cc8db0401c30e6e047110d514bae1fa36 (patch) | |
| tree | e646807d3bb8cb735c7d0928f80adfe699620c0d | |
| parent | c9a2c38b5645de22315aac35c78a40127b5d2fe9 (diff) | |
| parent | a2ba9119c6b20d227f75e9a3427df06b4923ee89 (diff) | |
| download | libquotient-c566c94cc8db0401c30e6e047110d514bae1fa36.tar.gz libquotient-c566c94cc8db0401c30e6e047110d514bae1fa36.zip | |
Merge pull request #561 from quotient-im/kitsune/gtad-submodule
Add GTAD as a submodule
| -rw-r--r-- | .github/workflows/ci.yml | 11 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | gtad/gtad | 0 |
3 files changed, 8 insertions, 6 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dac67b3b..9c777cbc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -175,14 +175,13 @@ jobs: cmake -S qtkeychain -B qtkeychain/build $CMAKE_ARGS cmake --build qtkeychain/build --target install - - name: Pull CS API and build GTAD + - name: get CS API definitions; clone and build GTAD if: matrix.update-api - working-directory: ${{ runner.workspace }} run: | - 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 + git clone --depth=1 https://github.com/quotient-im/matrix-spec.git ../matrix-spec + git submodule update --init --recursive --depth=1 + cmake -S gtad/gtad -B ../build/gtad $CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF + cmake --build ../build/gtad echo "CMAKE_ARGS=$CMAKE_ARGS -DMATRIX_SPEC_PATH=${{ runner.workspace }}/matrix-spec \ -DGTAD_PATH=${{ runner.workspace }}/build/gtad/gtad" \ >>$GITHUB_ENV diff --git a/.gitmodules b/.gitmodules index e69de29b..f3aef316 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "gtad/gtad"] + path = gtad/gtad + url = https://github.com/quotient-im/gtad.git diff --git a/gtad/gtad b/gtad/gtad new file mode 160000 +Subproject fcc8e0f28367f37890db9cfa5e96d08d599b36f |