Merge branch '5.3' into 5.4
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 9 Mar 2022 14:21:21 +0000 (15:21 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 9 Mar 2022 14:21:21 +0000 (15:21 +0100)
1  2 
.github/workflows/codestyle.yml
.github/workflows/javascript.yml
.github/workflows/php.yml
.github/workflows/typescript.yml

index 471e07e9a7921623a2abccd7fcb372ec1d19a657,a0a49dea4acd854fac71303d7ce97003700ecf12..53ac290e2b37d11af8c532af00cfb3551b6dac4b
@@@ -9,57 -8,9 +9,57 @@@ on
  
  jobs:
    php:
 -    name: PHP CodeSniffer
 +    name: PHP
      runs-on: ubuntu-latest
      steps:
-     - uses: actions/checkout@v2
+     - uses: actions/checkout@v3
 -    - run: git clone --branch=5.2 --depth=1 --quiet git://github.com/WoltLab/WCF.git WCF
 -    - uses: chekalsky/phpcs-action@e269c2f264f400adcda7c6b24c8550302350d495
 +    - name: phpcs
 +      uses: chekalsky/phpcs-action@e269c2f264f400adcda7c6b24c8550302350d495
 +    - name: Setup PHP with tools
 +      uses: shivammathur/setup-php@v2
 +      with:
 +        php-version: '8.0'
 +        extensions: ctype, dom, exif, gd, gmp, hash, intl, json, libxml, mbstring, opcache, pcre, pdo, pdo_mysql, zlib
 +        tools: php-cs-fixer:2.19.0
 +    - name: php-cs-fixer
 +      run: php-cs-fixer fix --dry-run --diff-format udiff
 +  ts:
 +    name: TS Prettier
 +    runs-on: ubuntu-latest
 +    steps:
-     - uses: actions/checkout@v2
++    - uses: actions/checkout@v3
 +    - name: Set up node.js
 +      uses: actions/setup-node@v2
 +      with:
 +        node-version: "16"
 +        cache: "npm"
 +    - run: npm install
 +    - name: Run prettier
 +      run: |
 +        shopt -s globstar
 +        npx prettier -w ts/**/*.ts
 +    - run: echo "::add-matcher::.github/diff.json"
 +    - name: Show diff
 +      run: |
 +        git checkout -- package-lock.json
 +        git diff --exit-code
 +  scss:
 +    name: SCSS Prettier
 +    runs-on: ubuntu-latest
 +    steps:
-       - uses: actions/checkout@v2
++      - uses: actions/checkout@v3
 +      - name: Set up node.js
 +        uses: actions/setup-node@v2
 +        with:
 +          node-version: "16"
 +          cache: "npm"
 +      - run: npm install
 +      - name: Run prettier
 +        run: |
 +          shopt -s globstar
 +          npx prettier -w files/style/*.scss
 +      - run: echo "::add-matcher::.github/diff.json"
 +      - name: Show diff
 +        run: |
 +          git checkout -- package-lock.json
 +          git diff --exit-code
index 7d0cdfb6ec0679f44e0c8ef2f0ada7d915e6a791,bd4a68f21795ea714fb2a6b65f7f286b856fd844..4b0925d9ffa50aea3b4f9413e8ab96e52e6908c9
@@@ -16,11 -15,11 +16,11 @@@ jobs
      strategy:
        fail-fast: false
      steps:
-     - uses: actions/checkout@v2
++    - uses: actions/checkout@v3
      - name: Set up node.js
 -      uses: actions/setup-node@v1
 +      uses: actions/setup-node@v2
        with:
 -        node-version: "12"
 -    - uses: actions/checkout@v3
 +        node-version: "16"
      - run: echo "::add-matcher::.github/javascript-syntax.json"
      - name: Remove files to be ignored
        run: |
Simple merge
index 286dee9aaf7ec0386f97e1989a2bb52490332732,0000000000000000000000000000000000000000..77ef3223f0de7cbbe0f806a2b51666788ace6a15
mode 100644,000000..100644
--- /dev/null
@@@ -1,58 -1,0 +1,58 @@@
-     - uses: actions/checkout@v2
 +name: TypeScript
 +
 +on:
 +  push:
 +    branches:
 +    - "5.4"
 +    - master
 +  pull_request:
 +
 +jobs:
 +  tsc:
 +    name: "TSC"
 +    runs-on: ubuntu-latest
 +    strategy:
 +      fail-fast: false
 +    steps:
-     - uses: actions/checkout@v2
++    - uses: actions/checkout@v3
 +    - name: Set up node.js
 +      uses: actions/setup-node@v2
 +      with:
 +        node-version: "16"
 +        cache: "npm"
 +    - run: npm install
 +    - run: npx tsc --noEmit
 +  eslint:
 +    name: "eslint"
 +    runs-on: ubuntu-latest
 +    strategy:
 +      fail-fast: false
 +    steps:
-     - uses: actions/checkout@v2
++    - uses: actions/checkout@v3
 +    - name: Set up node.js
 +      uses: actions/setup-node@v2
 +      with:
 +        node-version: "16"
 +        cache: "npm"
 +    - run: npm install
 +    - run: npx eslint .
 +  javascript_sync:
 +    name: "Check for outdated JavaScript"
 +    needs: tsc
 +    runs-on: ubuntu-latest
 +    strategy:
 +      fail-fast: false
 +    steps:
++    - uses: actions/checkout@v3
 +    - name: Set up node.js
 +      uses: actions/setup-node@v2
 +      with:
 +        node-version: "16"
 +        cache: "npm"
 +    - run: npm install
 +    - run: npx tsc
 +    - run: echo "::add-matcher::.github/diff.json"
 +    - name: Show diff
 +      run: |
 +        git checkout -- package-lock.json
 +        git diff --exit-code