Merge pull request #389 from vector-im/dbkr/js-sdk-bump-5e76697

Bump js-sdk for https://github.com/matrix-org/matrix-js-sdk/pull/2445
2022-06-08 19:35:58 +01:00 · 2022-06-08 19:29:49 +01:00 · 2022-06-08 14:45:56 +01:00 · 2022-06-08 14:35:27 +01:00 · 2022-06-08 14:34:29 +01:00 · 2022-06-08 10:22:40 +01:00
4 changed files with 8 additions and 4 deletions
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -32,10 +32,14 @@ jobs:
        with:
          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@dc7b9719a96d48369863986a06765841d7ea23f6
+
      - name: Build and push Docker image
        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
        with:
          context: .
+          platforms: linux/amd64,linux/arm64
          push: true
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM node:16-buster as builder
+FROM --platform=$BUILDPLATFORM node:16-buster as builder

 WORKDIR /src

--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
    "classnames": "^2.3.1",
    "color-hash": "^2.0.1",
    "events": "^3.3.0",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#aa0d3bd1f5a006d151f826e6b8c5f286abb6e960",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#5e766978b8cf80d943f796df1067722a6a5918a7",
    "mermaid": "^8.13.8",
    "normalize.css": "^8.0.1",
    "pako": "^2.0.4",
--- a/yarn.lock
+++ b/yarn.lock
@@ -8597,9 +8597,9 @@ matrix-events-sdk@^0.0.1-beta.7:
  resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
  integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==

-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#aa0d3bd1f5a006d151f826e6b8c5f286abb6e960":
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#5e766978b8cf80d943f796df1067722a6a5918a7":
  version "17.2.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/aa0d3bd1f5a006d151f826e6b8c5f286abb6e960"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/5e766978b8cf80d943f796df1067722a6a5918a7"
  dependencies:
    "@babel/runtime" "^7.12.5"
    another-json "^0.2.0"
Author	SHA1	Message	Date
David Baker	a7748a8492	Merge pull request #389 from vector-im/dbkr/js-sdk-bump-5e76697 Bump js-sdk for https://github.com/matrix-org/matrix-js-sdk/pull/2445	2022-06-08 19:35:58 +01:00
David Baker	edbcf95ead	Bump js-sdk for https://github.com/matrix-org/matrix-js-sdk/pull/2445	2022-06-08 19:29:49 +01:00
David Baker	fdcedb5592	Merge pull request #385 from vector-im/dbkr/bump_js_sdk_34ef7bc Bump js-sdk version for a couple of PTT network reliability fixes	2022-06-08 14:45:56 +01:00
David Baker	17098cf2ab	Also yarn.lock	2022-06-08 14:35:27 +01:00
David Baker	7ef3dcc56c	Bump js-sdk version for a couple of PTT network reliability fixes	2022-06-08 14:34:29 +01:00
David Baker	8a38276f5d	Merge pull request #346 from Kalissaac/main Add linux/arm64 Docker image	2022-06-08 10:22:40 +01:00
Kalissaac	93baa19ba1	Add arm64 Docker image Signed-off-by: Kian Sutarwala <kalissaac@protonmail.com>	2022-05-31 10:14:42 -07:00