diff --git a/.github/workflows/lint-eslint.yml b/.github/workflows/lint-eslint.yml new file mode 100644 index 0000000000000..11590ffb04af1 --- /dev/null +++ b/.github/workflows/lint-eslint.yml @@ -0,0 +1,44 @@ +# This workflow is provided via the organization template repository +# +# https://github.com/nextcloud/.github +# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization + +name: Lint + +on: + pull_request: + push: + branches: + - master + - stable* + +jobs: + lint: + runs-on: ubuntu-latest + + name: eslint + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Read package.json node and npm engines version + uses: skjnldsv/read-package-engines-version-actions@v1.1 + id: versions + with: + fallbackNode: '^12' + fallbackNpm: '^6' + + - name: Set up node ${{ steps.versions.outputs.nodeVersion }} + uses: actions/setup-node@v2 + with: + node-version: ${{ steps.versions.outputs.nodeVersion }} + + - name: Set up npm ${{ steps.versions.outputs.npmVersion }} + run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}" + + - name: Install dependencies + run: npm ci + + - name: Lint + run: npm run lint diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8fdd29480005e..db6f9bbf40cbe 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -40,25 +40,3 @@ jobs: composer run cs:check -- --format=checkstyle | cs2pr composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 ) shell: bash - - node: - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [12.x] - - name: eslint node${{ matrix.node-version }} - steps: - - uses: actions/checkout@v2 - - - name: Set up node ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - - name: Install dependencies - run: npm ci - - - name: Lint - run: npm run lint diff --git a/.github/workflows/node-tests.yml b/.github/workflows/node-tests.yml new file mode 100644 index 0000000000000..cacc8dbf589f7 --- /dev/null +++ b/.github/workflows/node-tests.yml @@ -0,0 +1,92 @@ +name: Node + +on: + pull_request: + push: + branches: + - master + - stable* + +jobs: + versions: + runs-on: ubuntu-latest + outputs: + nodeVersion: ${{ steps.versions.outputs.nodeVersion }} + npmVersion: ${{ steps.versions.outputs.npmVersion }} + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Read package.json node and npm engines version + uses: skjnldsv/read-package-engines-version-actions@v1.1 + id: versions + with: + fallbackNode: '^12' + fallbackNpm: '^6' + + test: + runs-on: ubuntu-latest + needs: versions + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Set up node ${{ needs.versions.outputs.nodeVersion }} + uses: actions/setup-node@v2 + with: + node-version: ${{ needs.versions.outputs.nodeVersion }} + + - name: Set up npm ${{ needs.versions.outputs.npmVersion }} + run: npm i -g npm@"${{ needs.versions.outputs.npmVersion }}" + + - name: Install dependencies + run: npm ci + + - name: Test + run: npm run test + + jsunit: + runs-on: ubuntu-latest + needs: versions + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Set up node ${{ needs.versions.outputs.nodeVersion }} + uses: actions/setup-node@v2 + with: + node-version: ${{ needs.versions.outputs.nodeVersion }} + + - name: Set up npm ${{ needs.versions.outputs.npmVersion }} + run: npm i -g npm@"${{ needs.versions.outputs.npmVersion }}" + + - name: Install dependencies + run: npm ci + + - name: Test + run: ./autotest-js.sh + + handlebars: + runs-on: ubuntu-latest + needs: versions + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Set up node ${{ needs.versions.outputs.nodeVersion }} + uses: actions/setup-node@v2 + with: + node-version: ${{ needs.versions.outputs.nodeVersion }} + + - name: Set up npm ${{ needs.versions.outputs.npmVersion }} + run: npm i -g npm@"${{ needs.versions.outputs.npmVersion }}" + + - name: Install dependencies + run: npm ci + + - name: Run compile + run: ./build/compile-handlebars-templates.sh diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index dbb654070be6f..4b20eb5ed029b 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -1,3 +1,8 @@ +# This workflow is provided via the organization template repository +# +# https://github.com/nextcloud/.github +# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization + name: Node on: @@ -9,71 +14,39 @@ on: jobs: build: - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [12.x] - + name: node steps: - - uses: actions/checkout@v2 - - name: Use node ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - name: Install dependencies & build - run: | - make clean - npm ci - npm run build --if-present - - name: Check webpack build changes - run: | - bash -c "[[ ! \"`git status --porcelain `\" ]] || ( echo 'Uncommited changes in webpack build' && git status && exit 1 )" - env: - CI: true + - name: Checkout + uses: actions/checkout@v2 - test: - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [12.x] - steps: - - uses: actions/checkout@v2 - - name: Use node ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - name: Install dependencies - run: | - npm ci - - name: Test - run: npm run test - - jsunit: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Use node ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - name: Test - run: ./autotest-js.sh + - name: Read package.json node and npm engines version + uses: skjnldsv/read-package-engines-version-actions@v1.1 + id: versions + with: + fallbackNode: '^12' + fallbackNpm: '^6' - handlebars: - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [12.x] - steps: - - uses: actions/checkout@v2 - - name: Use node ${{ matrix.node-version }} - uses: actions/setup-node@v1 + - name: Set up node ${{ steps.versions.outputs.nodeVersion }} + uses: actions/setup-node@v2 with: - node-version: ${{ matrix.node-version }} - - name: Install dependencies + node-version: ${{ steps.versions.outputs.nodeVersion }} + + - name: Set up npm ${{ steps.versions.outputs.npmVersion }} + run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}" + + - name: Install dependencies & build run: | npm ci - - name: Run compile - run: ./build/compile-handlebars-templates.sh + npm run build --if-present + + - name: Check webpack build changes + run: | + bash -c "[[ ! \"`git status --porcelain `\" ]] || exit 1" + + - name: Show changes on failure + if: failure() + run: | + git status + git --no-pager diff diff --git a/apps/accessibility/src/Accessibility.vue b/apps/accessibility/src/Accessibility.vue index 4baab2257e08c..b561f881aa65e 100644 --- a/apps/accessibility/src/Accessibility.vue +++ b/apps/accessibility/src/Accessibility.vue @@ -24,23 +24,27 @@