fix: upgrades

dword-design · Aug 23, 2020 · 54903a9 · 54903a9
1 parent f6f4f6c
commit 54903a9
Show file tree

Hide file tree

Showing 5 changed files with 986 additions and 749 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,52 +1,14 @@
-name: build
-on:
-  push:
-    branches:
-      - "**"
 jobs:
   cancel-existing:
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
     runs-on: ubuntu-latest
     steps:
-      - uses: rokroskar/workflow-run-cleanup-action@v0.2.2
-        env:
+      - env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  test:
-    needs: cancel-existing
-    strategy:
-      matrix:
-        os:
-          - macos-latest
-          - windows-latest
-          - ubuntu-latest
-        node:
-          - 10
-          - 12
-        exclude:
-          - os: macos-latest
-            node: 10
-          - os: windows-latest
-            node: 10
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node }}
-      - run: git config --global user.email "actions@github.com"
-      - run: git config --global user.name "GitHub Actions"
-      - run: yarn --frozen-lockfile
-      - run: yarn test
-      - name: Coveralls
-        if: matrix.os == 'ubuntu-latest' && matrix.node == 12
-        run: yarn dw-ci coveralls
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COVERALLS_SERVICE_NAME: github
-          COVERALLS_GIT_COMMIT: ${{ github.sha }}
-          COVERALLS_GIT_BRANCH: ${{ github.ref }}
+        uses: rokroskar/workflow-run-cleanup-action@v0.2.2
   release:
-    needs: test
     if: github.ref == 'refs/heads/master'
+    needs: test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -56,14 +18,55 @@ jobs:
       - run: git config --global user.email "actions@github.com"
       - run: git config --global user.name "GitHub Actions"
       - run: yarn --frozen-lockfile
+      - run: yarn clean
       - run: yarn lint
-      - name: Push changed files
-        run: yarn dw-ci push-changed-files
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - env:
           GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
-      - name: Release
-        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        name: Push changed files
+        run: yarn dw-ci push-changed-files
+      - env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        name: Release
         run: yarn semantic-release
+  test:
+    needs: cancel-existing
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+      - run: git config --global user.email "actions@github.com"
+      - run: git config --global user.name "GitHub Actions"
+      - run: yarn --frozen-lockfile
+      - run: yarn clean
+      - run: yarn test
+      - env:
+          COVERALLS_GIT_BRANCH: ${{ github.ref }}
+          COVERALLS_GIT_COMMIT: ${{ github.sha }}
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_SERVICE_NAME: github
+        if: matrix.os == 'ubuntu-latest' && matrix.node == 12
+        name: Coveralls
+        run: yarn dw-ci coveralls
+    strategy:
+      matrix:
+        exclude:
+          - node: 10
+            os: macos-latest
+          - node: 10
+            os: windows-latest
+        node:
+          - 10
+          - 12
+        os:
+          - macos-latest
+          - windows-latest
+          - ubuntu-latest
+name: build
+on:
+  push:
+    branches:
+      - "**"
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,11 @@
 .DS_Store
 /.babelrc.json
+/.commitlintrc.json
 /.cz.json
 /.editorconfig
 /.env.json
 /.eslintrc.json
+/.huskyrc.json
 /.nyc_output
 /.releaserc.json
 /.test.env.json

diff --git a/.renovaterc.json b/.renovaterc.json
@@ -2,6 +2,9 @@
   "extends": [
     ":semanticCommits"
   ],
+  "labels": [
+    "maintenance"
+  ],
   "packageRules": [
     {
       "packagePatterns": [
@@ -20,7 +23,6 @@
     }
   ],
   "lockFileMaintenance": {
-    "enabled": true,
-    "schedule": "at any time"
+    "enabled": true
   }
-}
+}
diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
     "dist"
   ],
   "scripts": {
+    "clean": "base clean",
     "commit": "base commit",
     "dev": "base dev",
     "lint": "base lint",