From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Tue, 31 May 2022 14:43:27 +0000 (+0200)
Subject: Merge branch '5.4' into 5.5
X-Git-Tag: 5.5.0_RC_1~24
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3466d7d109d68634b82f1797a32fb93cc28ad192;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.4' into 5.5
---

3466d7d109d68634b82f1797a32fb93cc28ad192
diff --cc .github/workflows/codestyle.yml
index 92202f496c,cf11fa03d1..6a0cabe655
--- a/.github/workflows/codestyle.yml
+++ b/.github/workflows/codestyle.yml
@@@ -28,10 -28,9 +28,10 @@@ jobs
      steps:
      - uses: actions/checkout@v3
      - name: Set up node.js
-       uses: actions/setup-node@v2
+       uses: actions/setup-node@v3
        with:
          node-version: "16"
 +        cache: "npm"
      - run: npm install
      - name: Run prettier
        run: |
@@@ -48,10 -47,9 +48,10 @@@
      steps:
      - uses: actions/checkout@v3
      - name: Set up node.js
-       uses: actions/setup-node@v2
+       uses: actions/setup-node@v3
        with:
          node-version: "16"
 +        cache: "npm"
      - run: npm install
      - name: Run prettier
        run: |
diff --cc .github/workflows/typescript.yml
index cbdbff5878,9eeea86944..71833b68c1
--- a/.github/workflows/typescript.yml
+++ b/.github/workflows/typescript.yml
@@@ -15,12 -14,11 +15,12 @@@ jobs
      strategy:
        fail-fast: false
      steps:
 +    - uses: actions/checkout@v3
      - name: Set up node.js
-       uses: actions/setup-node@v2
+       uses: actions/setup-node@v3
        with:
          node-version: "16"
 -    - uses: actions/checkout@v3
 +        cache: "npm"
      - run: npm install
      - run: npx tsc --noEmit
      - name: Check that tslib is in sync.
@@@ -31,12 -29,11 +31,12 @@@
      strategy:
        fail-fast: false
      steps:
 +    - uses: actions/checkout@v3
      - name: Set up node.js
-       uses: actions/setup-node@v2
+       uses: actions/setup-node@v3
        with:
          node-version: "16"
 -    - uses: actions/checkout@v3
 +        cache: "npm"
      - run: npm install
      - run: npx eslint .
    javascript_sync:
@@@ -46,12 -43,11 +46,12 @@@
      strategy:
        fail-fast: false
      steps:
 +    - uses: actions/checkout@v3
      - name: Set up node.js
-       uses: actions/setup-node@v2
+       uses: actions/setup-node@v3
        with:
          node-version: "16"
 -    - uses: actions/checkout@v3
 +        cache: "npm"
      - run: npm install
      - run: rm -r wcfsetup/install/files/js/WoltLabSuite/
      - run: npx tsc