diff --git a/.circleci/config.yml b/.circleci/config.yml index 26913354..b5f6fb12 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,6 @@ jobs: - node_modules - ~/.yarn key: v1-dependencies-{{ checksum "yarn.lock" }} - - run: yarn lint - run: yarn test --coverage -w=2 - run: yarn codecov diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6bc9c3e8..cf80a9ae 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,27 +4,20 @@ on: [push] jobs: php73: - name: PHP 7.3 + name: PHP Check runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - name: Install dependencies run: composer install --prefer-dist --no-progress --no-suggest - - name: Run tests - run: | - php -v - mysql -uroot -proot -e 'create database if not exists test;' - ./vendor/bin/phpunit - env: - APP_ENV: testing frontend: - name: Front End + name: JavaScript Check runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - name: Install dependencies run: yarn - - name: Run tests + - name: Run checks run: | yarn lint - yarn test + yarn tsc -p . diff --git a/package.json b/package.json index 96b51d58..2e777fc3 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "dev": "webpack-dev-server", "build": "rimraf public/app && webpack --mode=production -p && ts-node scripts/commitish.ts", "lint": "eslint --ext=.js,.vue,.ts -f=beauty .", - "test": "tsc -p . && jest", + "test": "jest", "new-version": "ts-node scripts/version.ts", "codecov": "codecov -F js" },