Merge branch '5.4' into 5.5
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 31 May 2022 14:43:27 +0000 (16:43 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 31 May 2022 14:43:27 +0000 (16:43 +0200)
1  2 
.github/workflows/codestyle.yml
.github/workflows/javascript.yml
.github/workflows/typescript.yml

index 92202f496cb5316c82981a5bbe75b501c47d6a31,cf11fa03d158aa654249f089a2093f8e440507e1..6a0cabe6553bbd3c9e230a981ec9d2e1c5a65731
@@@ -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: |
      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: |
Simple merge
index cbdbff58782da68f0fa370cde86d47296a3a33b3,9eeea869445cb443357867d16d62c8440e6bc4a2..71833b68c1a439ad9d1abd3b17e70d31a70ba103
@@@ -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.
      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:
      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