Merge branch 'develop' into Johennes-patch-1

element-hq · Nov 6, 2023 · 8b363f3 · 8b363f3
2 parents 4a7258c + 7214c7e
commit 8b363f3
Show file tree

Hide file tree

Showing 4 changed files with 351 additions and 256 deletions.
diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
@@ -41,13 +41,13 @@ jobs:
 
             - name: "Get modified files"
               id: changed_files
-              uses: tj-actions/changed-files@95690f9ece77c1740f4a55b7f1de9023ed6b1f87 # v39
+              uses: tj-actions/changed-files@40526807ee1e208a1a8c1bbe6bd2d1b044ef6368 # v40
               with:
                   files: |
-                      dockerbuild/*
+                      dockerbuild/**
             - name: Log in to the Container registry
               if: steps.changed_files.outputs.any_modified == 'true'
-              uses: docker/login-action@b4bedf8053341df3b5a9f9e0f2cf4e79e27360c6
+              uses: docker/login-action@1f401f745bf57e30b3a2800ad308a87d2ebdf14b
               with:
                   registry: ${{ env.REGISTRY }}
                   username: ${{ github.actor }}

diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml
@@ -20,15 +20,15 @@ jobs:
             - uses: actions/checkout@v3
 
             - name: Log in to the Container registry
-              uses: docker/login-action@b4bedf8053341df3b5a9f9e0f2cf4e79e27360c6
+              uses: docker/login-action@1f401f745bf57e30b3a2800ad308a87d2ebdf14b
               with:
                   registry: ${{ env.REGISTRY }}
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Extract metadata for Docker
               id: meta
-              uses: docker/metadata-action@879dcbb708d40f8b8679d4f7941b938a086e23a7
+              uses: docker/metadata-action@62339db73c56dd749060f65a6ebb93a6e056b755
               with:
                   images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
                   tags: |

diff --git a/package.json b/package.json
@@ -87,20 +87,20 @@
         "@typescript-eslint/eslint-plugin": "^5.42.0",
         "@typescript-eslint/parser": "^5.42.0",
         "allchange": "^1.0.6",
-        "app-builder-lib": "24.7.0",
+        "app-builder-lib": "24.8.0",
         "babel-jest": "^29.0.0",
         "chokidar": "^3.5.2",
         "detect-libc": "^1.0.3",
         "electron": "^27.0.0",
         "electron-builder": "24.6.4",
-        "electron-builder-squirrel-windows": "24.7.0",
+        "electron-builder-squirrel-windows": "24.8.0",
         "electron-devtools-installer": "^3.2.0",
         "eslint": "^8.26.0",
         "eslint-config-google": "^0.14.0",
         "eslint-config-prettier": "^9.0.0",
         "eslint-plugin-import": "^2.25.4",
         "eslint-plugin-matrix-org": "^1.0.0",
-        "eslint-plugin-unicorn": "^48.0.0",
+        "eslint-plugin-unicorn": "^49.0.0",
         "expect-playwright": "^0.8.0",
         "find-npm-prefix": "^1.0.2",
         "fs-extra": "^11.0.0",
@@ -123,7 +123,7 @@
         "keytar": "^7.9.0"
     },
     "resolutions": {
-        "@types/node": "16.18.52"
+        "@types/node": "16.18.59"
     },
     "build": {
         "appId": "im.riot.app",