Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,28 @@ on:
jobs:
build:
runs-on: ubuntu-latest
name: Build

strategy:
matrix:
node-version: [14, 15, 16]

name: node${{ matrix.node-version }}

steps:
- uses: actions/checkout@master
- name: Set up Node
uses: actions/setup-node@v1
- uses: actions/checkout@v2

- name: Set up node ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- name: npm install

- name: Set up npm 7
run: npm i -g npm@7

- name: Install dependencies
run: npm ci
- name: build

- name: Build
run: npm run build
env:
CI: true
21 changes: 16 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v2
- name: Download schema
run: wget https://apps.nextcloud.com/schema/apps/info.xsd
- name: Lint info.xml
Expand All @@ -28,7 +28,7 @@ jobs:
name: php${{ matrix.php-versions }} lint
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v2
- name: Set up php${{ matrix.php-versions }}
uses: shivammathur/setup-php@master
with:
Expand All @@ -40,14 +40,21 @@ jobs:
node-linters:
runs-on: ubuntu-latest
name: ESLint

steps:
- uses: actions/checkout@master
- uses: actions/checkout@v2

- name: Set up Node
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: 14

- name: Set up npm7
run: npm i -g npm@7

- name: npm install
run: npm ci

- name: eslint
run: npm run lint
env:
Expand All @@ -56,15 +63,19 @@ jobs:
php-cs-fixer:
name: php-cs check
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v2

- name: Set up php
uses: shivammathur/setup-php@master
with:
php-version: 7.4
coverage: none

- name: Install dependencies
run: composer i

- name: Run coding standards check
run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )
8 changes: 6 additions & 2 deletions .github/workflows/npm-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@ jobs:
node-version: [14, 15, 16]

name: node${{ matrix.node-version }}

steps:
- uses: actions/checkout@v2

- name: Set up node ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-versions: ${{ matrix.node-version }}
node-version: ${{ matrix.node-version }}

- name: Set up npm 7
run: npm i -g npm@7

- name: Install dependencies
run: npm ci
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
name: Build release tarball
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v2
- name: Set up Node
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: 15
- name: Set up php$
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/php-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Install Nextcloud
run: php -f nextcloud/occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database sqlite --database-pass=''
- name: Checkout the app
uses: actions/checkout@master
uses: actions/checkout@v2
with:
path: nextcloud/apps/calendar
- name: Fix php-parser on stable20 incompatibility with phpunit 9.3+
Expand Down
2 changes: 1 addition & 1 deletion .stylelintignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/src/fonts
src/fonts
41 changes: 0 additions & 41 deletions .stylelintrc

This file was deleted.

14 changes: 3 additions & 11 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
module.exports = {
presets: [
[
'@babel/preset-env',
{
useBuiltIns: 'usage',
corejs: 3
}
]
]
};
const babelConfig = require('@nextcloud/babel-config')

module.exports = babelConfig
2 changes: 1 addition & 1 deletion lib/Dashboard/CalendarWidget.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public function getUrl(): ?string {
* @inheritDoc
*/
public function load(): void {
\OCP\Util::addScript('calendar', 'dashboard');
\OCP\Util::addScript('calendar', 'calendar-dashboard');

$this->initialStateService->provideLazyInitialState(Application::APP_ID, 'dashboard_data', function () {
return $this->dataService;
Expand Down
Loading