From ef046268c1acc7f9a141ff124b30bc449ea59216 Mon Sep 17 00:00:00 2001 From: Shuta Kumano Date: Sat, 18 Jan 2020 00:35:25 +0900 Subject: [PATCH 1/7] disable can not running travis task --- .travis.yml | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d55883be..1cd675d67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ addon: firefox: latest env: matrix: - - CMD=test:sauce + # - CMD=test:sauce - CMD=test - CMD=lint before_install: @@ -22,27 +22,22 @@ script: before_deploy: - npm run build deploy: -- provider: npm - skip_cleanup: true - email: develop@uncovertruth.co.jp - api_key: - secure: aGKtfwPsNUlNqTfpBU9SJoTOtwli7+LLcjg/HtZJgFcPrQVow+yOzsKuq7KCMN3IBIxf8yK9rIlvknpquyacU8ma5uMRb26BN8AMqfPwspK+sFm3JdGPpQBB5zPELCA+PeYVyYTeTOUB61cBdce9rJ7LPWap3wQOiUAlRkIMlr8PRpOXaCjUHFWHiJH2yRDnnGqjouM9q6SexquvKeAyYuYxD+FeBWXBs74Z7/CG54Emhsr2GDd6jPUAfV4SdfAGWNKpjY/8hL4BejS1CU2cb/uaog8BKD/f9mSq6V+NOjqM1SN9eCDeB8vfhYDytGM686Pu1QiV6a9Zt1t2ePjzjtqhGmLzJ2WZahuQk8Ziv6fBwlmCw6GNe+ImLoYEwfzd1DLZHz4RF7BFmxbRjmwrl9dF4HVWN2XSsPvlhNwQQQmybkQiR1lbCZ+q2kb8cfGAA/BwxkvAYq2b3l/EKxq4N7ZXQpwjbbTrqk+jBjgcVKdEFAZy833sJxNOBvej+AFrV6VkD5TblJLhH3tSFOAbsSxr3YlXiZmEpmpMMJDj2PwUHqU9PBivajr3dxqGxvB47iS3DH4TZtzdaPiM4aFSoWv8nTLYjsSQn0oMcX/3RGAEi9JUbAPT6UHtZgBnP6MZye3ohYCo3oPh8sDZiszIe0WzrqdXQATYLwcevl/8v1Q= - on: - repo: uncovertruth/auto-cookie - tags: true - condition: "$CMD = test" -- provider: pages - skip-cleanup: true - github-token: - secure: lZFJI/yhD/IzB0aAw53o1IzFBMTpF/ec3oGN/JV5JYZ1QVrAkRzlX3CAbeLTYY/7vTuuXs39XyG9gtvYNM3wlAbCZhNk6a6HfHfq3yzfId0TX8I5FmUoXY4Qmp4O61K1CDOKgd+dKwVoyU6OKdmnMAXu1YZC9QBWKrV49+yiBhmJdfPtj3Zj6S3NzzuPCMGZNeY4LCuaaddwjGSt3BqbmY1rmi+UJyWIpNKrAA4rPUzptBkLr6XN0Xz+1/4q+hW96vU6z1fVn5bt0h3hwRVCB2KiKrhZy0Gy7uxokLNs33gSFqeB4kU8f2Q1+1CPnUE/XWqM3qtPzcgs6t0GtPf+FXp6YVMB9xb7ofopeK8nRfco4TJK/wyKx3px72Abu/yu+oKr5OovUZOERdPrwN4I6ZYYH22Kq+Sl44g74cwKzFZYzqEzV+2pNd975KKnK8jWvGNNL0PeFI21A/RMsGnkVjkAFORIaWr1nb+SAd8CIGVIsWEo0v4HM9XYrcdsHkhUrCSru4yJYg1qDF1nYonNdbuUgHCuSeXKd4rBufI6FgfOR3YFNV0MlVZ+0i24o4c+9Fm1vi7/hrHfP2zWW43uQ7U2mHPHkR4HM7H9sTwwuFyGQoUFjShYcKYnZs922FaAkKlbMGEY8hG+xpVoT67cy1aStFjDhmouj9MVnIhvnbk= - keep-history: true - local-dir: example - on: - repo: uncovertruth/auto-cookie - tags: true - condition: "$CMD = 'test'" -notifications: - email: false - slack: - rooms: - secure: i8a1B/3flSOmHh5otvsYleYl4CVQ6gKhQUcdHZBfHaLGmkCboygXZOv1W3ED3wpjP5BpvAIfZ/vRmjk2glKjCQ90oGE3i/aixW3GjpGAeM9CSDtxQojwSnt+vBdntMZ95Jt0P5phtwS8CRC47X1iGtGN/7pydCyl8pzrHfyYf3Np/iuxpal0XWJf8EPDu1eGabTcpz5JS4XBaYrK+VHeo+Yhh37akufaBJxH2wm0Hu6KoqcJHtVT8IsNnSrxKWuKvQPrgPPu9PUOPNNOxiB3MD2YTisrvnUj/kTm0xMKk5zbyAPC/EyoPq6KBk2Rg53gkb4d08EjlnSYpXHBGBQGOZhMEJCfRTc0ZNWUCBmoQpcsFZtCi+g25xK/Qj7/5Xu2zU1wacVtss+REwhiO93028+HmrWKYZqE11P+BJWJo4OLLR5lzIAvy+FpKCZx88TS0glAfLVXP/YGFo5WULQt6deR75x6Ard2Gl8NbXfGGba0BYoTdhiPcxgqQiRiT9htFf6uBTs57xKjMj+hhI/14iCkJqcKpE9pSyhIRO2m41zrhUcmYpc/w5IXmGVIHCmoK9a2rDvRokUMs4oy/QnWpt6fanvh51/d5GO8jcGNodulv6sl/itZABaq0dtEy71LQaM1yWSHh4om8oJj8ZsGDy7VTRSAop/PEJT6l29x2Ys= +# - provider: npm +# skip_cleanup: true +# email: develop@uncovertruth.co.jp +# api_key: +# secure: +# on: +# repo: uncovertruth/auto-cookie +# tags: true +# condition: "$CMD = test" +# - provider: pages +# skip-cleanup: true +# github-token: +# secure: lZFJI/yhD/IzB0aAw53o1IzFBMTpF/ec3oGN/JV5JYZ1QVrAkRzlX3CAbeLTYY/7vTuuXs39XyG9gtvYNM3wlAbCZhNk6a6HfHfq3yzfId0TX8I5FmUoXY4Qmp4O61K1CDOKgd+dKwVoyU6OKdmnMAXu1YZC9QBWKrV49+yiBhmJdfPtj3Zj6S3NzzuPCMGZNeY4LCuaaddwjGSt3BqbmY1rmi+UJyWIpNKrAA4rPUzptBkLr6XN0Xz+1/4q+hW96vU6z1fVn5bt0h3hwRVCB2KiKrhZy0Gy7uxokLNs33gSFqeB4kU8f2Q1+1CPnUE/XWqM3qtPzcgs6t0GtPf+FXp6YVMB9xb7ofopeK8nRfco4TJK/wyKx3px72Abu/yu+oKr5OovUZOERdPrwN4I6ZYYH22Kq+Sl44g74cwKzFZYzqEzV+2pNd975KKnK8jWvGNNL0PeFI21A/RMsGnkVjkAFORIaWr1nb+SAd8CIGVIsWEo0v4HM9XYrcdsHkhUrCSru4yJYg1qDF1nYonNdbuUgHCuSeXKd4rBufI6FgfOR3YFNV0MlVZ+0i24o4c+9Fm1vi7/hrHfP2zWW43uQ7U2mHPHkR4HM7H9sTwwuFyGQoUFjShYcKYnZs922FaAkKlbMGEY8hG+xpVoT67cy1aStFjDhmouj9MVnIhvnbk= +# keep-history: true +# local-dir: example +# on: +# repo: uncovertruth/auto-cookie +# tags: true +# condition: "$CMD = 'test'" From b4dd0bd19ae604fb718dcef80173b31b6d6b2b88 Mon Sep 17 00:00:00 2001 From: Shuta Kumano Date: Sat, 18 Jan 2020 00:43:47 +0900 Subject: [PATCH 2/7] grouping update modules in renovate --- renovate.json | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/renovate.json b/renovate.json index c06753ba5..48433a1e5 100644 --- a/renovate.json +++ b/renovate.json @@ -1,15 +1,29 @@ { + "timezone": "Asia/Tokyo", "extends": [ - "config:base" + "config:base", + "schedule:daily" ], - "automerge": true, - "major": { - "automerge": false - }, - "labels": [ - "dependencies" + "packageRules": [ + { + "packagePatterns": [ + "*" + ] + }, + { + "depTypeList": [ + "dependencies" + ], + "groupName": "dependencies" + }, + { + "depTypeList": [ + "devDependencies" + ], + "groupName": "devDependencies" + } ], - "devDependencies": { - "automerge": true - } + "labels": [ + "dependency" + ] } From 0d7bae9dc5bb5f11494973c1c736abc63bcad516 Mon Sep 17 00:00:00 2001 From: Shuta Kumano Date: Sat, 18 Jan 2020 00:48:05 +0900 Subject: [PATCH 3/7] update author and urls --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index f28583cc9..c80b43e45 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,9 @@ "name": "auto-cookie", "description": "auto set cookie domain like google-analytics", "version": "2.0.0", - "author": "UNCOVER TRUTH Inc.", + "author": "harikitech", "bugs": { - "url": "https://github.com/uncovertruth/auto-cookie/issues" + "url": "https://github.com/harikitech/auto-cookie/issues" }, "dependencies": {}, "devDependencies": { @@ -46,7 +46,7 @@ "files": [ "lib/" ], - "homepage": "https://github.com/uncovertruth/auto-cookie#readme", + "homepage": "https://github.com/harikitech/auto-cookie#readme", "keywords": [ "cookie" ], @@ -72,7 +72,7 @@ }, "repository": { "type": "git", - "url": "git+ssh://git@github.com/uncovertruth/auto-cookie.git" + "url": "git+ssh://git@github.com/harikitech/auto-cookie.git" }, "scripts": { "build": "tsc && webpack --env=production && size-limit", From b195440a4403c176058ef53f8f0bed0ff062e741 Mon Sep 17 00:00:00 2001 From: Shuta Kumano Date: Sat, 18 Jan 2020 00:52:38 +0900 Subject: [PATCH 4/7] minimum travis task --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1cd675d67..056e849fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,9 @@ sudo: false jdk: - oraclejdk8 node_js: lts/* -matrix: - allow_failures: - - env: CMD=test:sauce +# matrix: +# allow_failures: +# - env: CMD=test:sauce addon: firefox: latest env: @@ -13,15 +13,15 @@ env: # - CMD=test:sauce - CMD=test - CMD=lint -before_install: -- export DISPLAY=:99.0 -- sh -e /etc/init.d/xvfb start -- sleep 5 +# before_install: +# - export DISPLAY=:99.0 +# - sh -e /etc/init.d/xvfb start +# - sleep 5 script: - npm run $CMD -before_deploy: -- npm run build -deploy: +# before_deploy: +# - npm run build +# deploy: # - provider: npm # skip_cleanup: true # email: develop@uncovertruth.co.jp From a972c48a2b6f57fe96700b597412c87a8e497e54 Mon Sep 17 00:00:00 2001 From: Shuta Kumano Date: Sat, 18 Jan 2020 01:11:12 +0900 Subject: [PATCH 5/7] reconstruct travis config --- .travis.yml | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 056e849fb..2ebb5f927 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,19 @@ -language: node_js sudo: false +language: node_js jdk: - oraclejdk8 node_js: lts/* -# matrix: -# allow_failures: -# - env: CMD=test:sauce addon: firefox: latest -env: - matrix: - # - CMD=test:sauce - - CMD=test - - CMD=lint -# before_install: -# - export DISPLAY=:99.0 -# - sh -e /etc/init.d/xvfb start -# - sleep 5 -script: -- npm run $CMD -# before_deploy: -# - npm run build +stages: + - test +jobs: + include: + - stage: Test + name: lint + script: yarn lint + name: test + script: yarn test # deploy: # - provider: npm # skip_cleanup: true From 51e3ab4e82b7a7a2fb86bae7b077b560964c6d08 Mon Sep 17 00:00:00 2001 From: Shuta Kumano Date: Sat, 18 Jan 2020 01:24:09 +0900 Subject: [PATCH 6/7] use node v10 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2ebb5f927..47e9ac67b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: false language: node_js jdk: - oraclejdk8 -node_js: lts/* +node_js: 10 addon: firefox: latest stages: From 1517a72ae27f5a48a417b532e336c5063e6c4ef5 Mon Sep 17 00:00:00 2001 From: Shuta Kumano Date: Sat, 18 Jan 2020 01:36:05 +0900 Subject: [PATCH 7/7] fix stage jobs --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 47e9ac67b..a0f273184 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ jobs: - stage: Test name: lint script: yarn lint + - script: yarn test name: test - script: yarn test # deploy: # - provider: npm # skip_cleanup: true