aboutsummaryrefslogtreecommitdiff
path: root/build/gobind-pinecone
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2021-05-18 15:47:15 +0100
committerNeil Alexander <neilalexander@users.noreply.github.com>2021-05-18 15:47:15 +0100
commit140cae81cc0de1465d47b0197e6f50b0f1f26376 (patch)
tree87ee3dcf234f8a99756f58e23d6049403badf2f7 /build/gobind-pinecone
parent1d89c4a3cd707773cf2c13c2579da856226f124e (diff)
Update dendrite-demo-pinecone
Diffstat (limited to 'build/gobind-pinecone')
-rw-r--r--build/gobind-pinecone/build.sh2
-rw-r--r--build/gobind-pinecone/monolith.go1
2 files changed, 2 insertions, 1 deletions
diff --git a/build/gobind-pinecone/build.sh b/build/gobind-pinecone/build.sh
index 6fd05a64..0f1b1aab 100644
--- a/build/gobind-pinecone/build.sh
+++ b/build/gobind-pinecone/build.sh
@@ -7,7 +7,7 @@ do
case "$option"
in
a) gomobile bind -v -target android -trimpath -ldflags="-s -w" github.com/matrix-org/dendrite/build/gobind-pinecone ;;
- i) gomobile bind -v -target ios -trimpath -ldflags="-s -w" github.com/matrix-org/dendrite/build/gobind-pinecone ;;
+ i) gomobile bind -v -target ios -trimpath -ldflags="" github.com/matrix-org/dendrite/build/gobind-pinecone ;;
*) echo "No target specified, specify -a or -i"; exit 1 ;;
esac
done \ No newline at end of file
diff --git a/build/gobind-pinecone/monolith.go b/build/gobind-pinecone/monolith.go
index b5e1593a..e6934095 100644
--- a/build/gobind-pinecone/monolith.go
+++ b/build/gobind-pinecone/monolith.go
@@ -272,6 +272,7 @@ func (m *DendriteMonolith) Start() {
cfg.AppServiceAPI.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s/%s-appservice.db", m.StorageDirectory, prefix))
cfg.MediaAPI.BasePath = config.Path(fmt.Sprintf("%s/media", m.CacheDirectory))
cfg.MediaAPI.AbsBasePath = config.Path(fmt.Sprintf("%s/media", m.CacheDirectory))
+ cfg.MSCs.MSCs = []string{"msc2836", "msc2946"}
if err := cfg.Derive(); err != nil {
panic(err)
}