From b83cd742069d97ee2d8b41d0584a89741f655517 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sun, 2 Sep 2018 15:47:47 +0900 Subject: [PATCH 01/26] =?UTF-8?q?=E3=83=91=E3=83=BC=E3=83=9F=E3=83=83?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E5=A4=89=E6=9B=B4=E3=80=82=E5=AE=9F?= =?UTF-8?q?=E8=A1=8C=E6=A8=A9=E3=82=92=E5=A4=96=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/TaskContent.php | 0 Model/TasksAppModel.php | 0 Test/Case/Controller/TaskContentsController/IndexTest.php | 0 Test/Case/Model/TaskCharge/GetSelectChargeUsersTest.php | 0 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 Model/TaskContent.php mode change 100755 => 100644 Model/TasksAppModel.php mode change 100755 => 100644 Test/Case/Controller/TaskContentsController/IndexTest.php mode change 100755 => 100644 Test/Case/Model/TaskCharge/GetSelectChargeUsersTest.php diff --git a/Model/TaskContent.php b/Model/TaskContent.php old mode 100755 new mode 100644 diff --git a/Model/TasksAppModel.php b/Model/TasksAppModel.php old mode 100755 new mode 100644 diff --git a/Test/Case/Controller/TaskContentsController/IndexTest.php b/Test/Case/Controller/TaskContentsController/IndexTest.php old mode 100755 new mode 100644 diff --git a/Test/Case/Model/TaskCharge/GetSelectChargeUsersTest.php b/Test/Case/Model/TaskCharge/GetSelectChargeUsersTest.php old mode 100755 new mode 100644 From bf331da6eed68a9709feba10a243df7ee7a78f48 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Mon, 3 Sep 2018 21:50:54 +0900 Subject: [PATCH 02/26] =?UTF-8?q?=E3=83=91=E3=83=BC=E3=83=9F=E3=83=83?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E5=A4=89=E6=9B=B4=E3=80=82=E5=AE=9F?= =?UTF-8?q?=E8=A1=8C=E6=A8=A9=E3=82=92=E5=A4=96=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/TaskContent.php | 0 Model/TasksAppModel.php | 0 Test/Case/Controller/TaskContentsController/IndexTest.php | 0 Test/Case/Model/TaskCharge/GetSelectChargeUsersTest.php | 0 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 Model/TaskContent.php mode change 100755 => 100644 Model/TasksAppModel.php mode change 100755 => 100644 Test/Case/Controller/TaskContentsController/IndexTest.php mode change 100755 => 100644 Test/Case/Model/TaskCharge/GetSelectChargeUsersTest.php diff --git a/Model/TaskContent.php b/Model/TaskContent.php old mode 100755 new mode 100644 diff --git a/Model/TasksAppModel.php b/Model/TasksAppModel.php old mode 100755 new mode 100644 diff --git a/Test/Case/Controller/TaskContentsController/IndexTest.php b/Test/Case/Controller/TaskContentsController/IndexTest.php old mode 100755 new mode 100644 diff --git a/Test/Case/Model/TaskCharge/GetSelectChargeUsersTest.php b/Test/Case/Model/TaskCharge/GetSelectChargeUsersTest.php old mode 100755 new mode 100644 From 47fa31ba4d5cd0dc6bebf647153eb36c81c87c40 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 23 Jan 2019 18:08:52 +0900 Subject: [PATCH 03/26] =?UTF-8?q?=E3=82=BF=E3=82=B0=E3=81=8C=E5=85=A5?= =?UTF-8?q?=E3=82=8C=E5=AD=90=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=82=8B=20https://github.com/NetCommons3/NetCommons3/issues/1?= =?UTF-8?q?438?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/Elements/TaskContents/task_content.ctp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/View/Elements/TaskContents/task_content.ctp b/View/Elements/TaskContents/task_content.ctp index 52ed29e..c7b75c8 100644 --- a/View/Elements/TaskContents/task_content.ctp +++ b/View/Elements/TaskContents/task_content.ctp @@ -32,6 +32,7 @@ echo $this->NetCommonsHtml->css('/tasks/css/tasks.css'); + 'task_progress_rate', @@ -64,7 +65,6 @@ echo $this->NetCommonsHtml->css('/tasks/css/tasks.css'); $disabled = ''; } ?> -
NetCommonsForm->input( '', array( @@ -77,8 +77,8 @@ echo $this->NetCommonsHtml->css('/tasks/css/tasks.css'); ) ); ?>
- NetCommonsForm->end(); ?> + Date: Thu, 9 May 2019 11:22:52 +0900 Subject: [PATCH 04/26] =?UTF-8?q?change:=20beforeValidate()=E3=82=92?= =?UTF-8?q?=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=99=E3=81=9F=E3=81=B3=E3=81=AB?= =?UTF-8?q?Hash::merge=E3=81=A7=E3=83=90=E3=83=AA=E3=83=87=E3=83=BC?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=AB=E3=83=BC=E3=83=AB=E3=81=8C?= =?UTF-8?q?=E5=A2=97=E3=81=88=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82?= =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82ValidateM?= =?UTF-8?q?erge::merge=E3=81=B8=E7=BD=AE=E3=81=8D=E6=8F=9B=E3=81=88?= =?UTF-8?q?=E3=81=9F=20Refs=20https://github.com/NetCommons3/NetCommons3/i?= =?UTF-8?q?ssues/1486?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/TaskContent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/TaskContent.php b/Model/TaskContent.php index 1312aa8..f3de30f 100644 --- a/Model/TaskContent.php +++ b/Model/TaskContent.php @@ -181,7 +181,7 @@ public function beforeValidate($options = array()) { $getValidate = $this->_getValidateSpecification(); } - $this->validate = Hash::merge( + $this->validate = ValidateMerge::merge( $this->validate, $getValidate ); From d058dd99a943b5c5b42aca663e75312b47c0ff31 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Mon, 23 Sep 2019 16:54:23 +0900 Subject: [PATCH 05/26] =?UTF-8?q?fix:=20test:=20UnitTest=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=20https://github.com/NetCommons3/NetCommons3/issues/1468?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaskBlockRolePermissionsController/EditTest.php | 6 +++--- Test/Case/Controller/TaskBlocksController/EditTest.php | 2 +- .../Case/Controller/TaskProgressRateController/EditTest.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Test/Case/Controller/TaskBlockRolePermissionsController/EditTest.php b/Test/Case/Controller/TaskBlockRolePermissionsController/EditTest.php index e449ccb..c39d6a1 100644 --- a/Test/Case/Controller/TaskBlockRolePermissionsController/EditTest.php +++ b/Test/Case/Controller/TaskBlockRolePermissionsController/EditTest.php @@ -73,9 +73,9 @@ private function __data() { 'TaskSetting' => array( 'id' => 2, 'task_key' => 'task_key_2', - 'use_workflow' => true, - 'use_comment_approval' => true, - 'approval_type' => true, + 'use_workflow' => '1', + 'use_comment_approval' => '1', + 'approval_type' => '1', ) ); diff --git a/Test/Case/Controller/TaskBlocksController/EditTest.php b/Test/Case/Controller/TaskBlocksController/EditTest.php index c44b146..eda7c05 100644 --- a/Test/Case/Controller/TaskBlocksController/EditTest.php +++ b/Test/Case/Controller/TaskBlocksController/EditTest.php @@ -66,7 +66,7 @@ private function __data($isEdit) { $frameId = '6'; //$frameKey = 'frame_3'; if ($isEdit) { - $blockId = '4'; + $blockId = '2'; $blockKey = 'block_2'; $taskId = '3'; $taskKey = 'task_key_2'; diff --git a/Test/Case/Controller/TaskProgressRateController/EditTest.php b/Test/Case/Controller/TaskProgressRateController/EditTest.php index fab86d9..575b619 100644 --- a/Test/Case/Controller/TaskProgressRateController/EditTest.php +++ b/Test/Case/Controller/TaskProgressRateController/EditTest.php @@ -190,10 +190,10 @@ public function testEditPostValidationError() { array('action' => 'edit', 'content_key' => 'task_content_key'), 'BadRequestException', 'json'); $expected = array( - 'name' => '不正なリクエストの可能性があります。', + 'name' => 'Bad Request', 'code' => 400, 'class' => 'danger', - 'interval' => 4000, + 'interval' => 6000, //'plugin' => 'NetCommons', 'ajax' => true, 'error' => '不正なリクエストの可能性があります。', From be6b255614fe89e978bf16430ea6286307f4b6d1 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Mon, 23 Sep 2019 16:55:15 +0900 Subject: [PATCH 06/26] =?UTF-8?q?fix:=20test:=20travis-ci=E3=81=AEphp7.2?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C=20https://github.com/NetCommons3/NetCommons3?= =?UTF-8?q?/issues/1451?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 2 ++ phpunit.xml.dist | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 898a57f..4a669a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,10 @@ php: - 5.6 - 7.0 - 7.1 + - 7.2 sudo: false +dist: trusty env: - NETCOMMONS_VERSION=master DB=mysql diff --git a/phpunit.xml.dist b/phpunit.xml.dist index fa43926..3b7ace6 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -14,6 +14,5 @@ - From 5257684415e1cd86624e93ab0c7972b9f2f28aa8 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Mon, 23 Sep 2019 17:39:53 +0900 Subject: [PATCH 07/26] =?UTF-8?q?fix:=20test:=20UnitTest=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=20https://github.com/NetCommons3/NetCommons3/issues/1468?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test/Case/Controller/TaskProgressRateController/EditTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Test/Case/Controller/TaskProgressRateController/EditTest.php b/Test/Case/Controller/TaskProgressRateController/EditTest.php index 575b619..7d12b0c 100644 --- a/Test/Case/Controller/TaskProgressRateController/EditTest.php +++ b/Test/Case/Controller/TaskProgressRateController/EditTest.php @@ -197,6 +197,7 @@ public function testEditPostValidationError() { //'plugin' => 'NetCommons', 'ajax' => true, 'error' => '不正なリクエストの可能性があります。', + 'message' => '不正なリクエストの可能性があります。', ); $this->assertEquals($expected, $result); From 8719aa2ba77bc59297c4c586972e573c31e0d308 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 27 Dec 2019 12:24:44 +0900 Subject: [PATCH 08/26] =?UTF-8?q?fix:=20=E3=83=AA=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E5=8F=96=E5=BE=97=E3=81=AE=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/TaskProgressRateController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/TaskProgressRateController.php b/Controller/TaskProgressRateController.php index 9415800..1459945 100644 --- a/Controller/TaskProgressRateController.php +++ b/Controller/TaskProgressRateController.php @@ -64,7 +64,7 @@ public function edit() { ); // 元の画面を表示 - $this->redirect($this->request->referer()); + $this->redirect($this->request->referer(true)); } } } From 483faa25559409c25c1161034aadee3ef5898042 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sat, 14 Mar 2020 15:05:19 +0900 Subject: [PATCH 09/26] =?UTF-8?q?change:=20test:=20travis.yml=E3=81=8B?= =?UTF-8?q?=E3=82=89php5.4,5.5=E3=82=92=E5=89=8A=E9=99=A4=E3=80=82php7.3,7?= =?UTF-8?q?.4=E3=82=92=E8=BF=BD=E5=8A=A0=20https://github.com/NetCommons3/?= =?UTF-8?q?NetCommons3/issues/1560?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4a669a3..be2e2bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,12 @@ language: php php: - - 5.4 - - 5.5 - 5.6 - 7.0 - 7.1 - 7.2 + - 7.3 + - 7.4 sudo: false dist: trusty From d12727703c6c52c13bfeccb389525b9d3e357ab1 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sat, 8 Aug 2020 16:18:47 +0900 Subject: [PATCH 10/26] =?UTF-8?q?change:=20test:=20Travis=E3=81=8B?= =?UTF-8?q?=E3=82=89PHP5.6=E3=82=92=E5=89=8A=E9=99=A4,php72=E4=BB=A5?= =?UTF-8?q?=E9=99=8D=E3=81=A7UnitTest=E3=81=A7Warning=E3=81=8C=E5=87=BA?= =?UTF-8?q?=E3=82=8B=E3=81=9F=E3=82=81=E4=BF=AE=E6=AD=A3=20https://github.?= =?UTF-8?q?com/NetCommons3/NetCommons3/issues/1588?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 1 - phpunit.xml.dist | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index be2e2bc..95d4afe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php php: - - 5.6 - 7.0 - 7.1 - 7.2 diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 3b7ace6..b7cbc38 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,5 +1,11 @@ + + + + + + app/Plugin/Tasks From 8d5f85d24fa2c6ff82326679b94c41cd57538d27 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 26 Aug 2020 20:22:31 +0900 Subject: [PATCH 11/26] change: Version number to 3.3.2 --- VERSION.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 VERSION.txt diff --git a/VERSION.txt b/VERSION.txt new file mode 100644 index 0000000..4772543 --- /dev/null +++ b/VERSION.txt @@ -0,0 +1 @@ +3.3.2 From da606e9233e9adef9441c0bf46b46e4a544c38b0 Mon Sep 17 00:00:00 2001 From: ryu818 Date: Fri, 11 Dec 2020 11:23:22 +0900 Subject: [PATCH 12/26] =?UTF-8?q?fix:=20WYSIWYG=E3=81=AB=E3=81=8A=E3=81=91?= =?UTF-8?q?=E3=82=8B=E8=A8=AD=E5=AE=9A=E3=83=9F=E3=82=B9=E3=81=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20https://github.com/researchmap/RmNetCommons3/issues?= =?UTF-8?q?/2331?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/TaskContent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/TaskContent.php b/Model/TaskContent.php index f3de30f..7f1000e 100644 --- a/Model/TaskContent.php +++ b/Model/TaskContent.php @@ -649,7 +649,7 @@ public function saveContent($data) { $this->setSetting(MailQueueBehavior::MAIL_QUEUE_SETTING_USER_IDS, $mailSendUserIdArr); } - $savedData = $this->save($data, false); + $savedData = $this->save(null, false); if ($savedData === false) { //このsaveで失敗するならvalidate以外なので例外なげる throw new InternalErrorException(__d('net_commons', 'Internal Server Error')); From 9deece2e22a0fb9170ee79aca4da58db98c28d48 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sun, 13 Dec 2020 15:38:08 +0900 Subject: [PATCH 13/26] =?UTF-8?q?fix:=20test:=20TravisCI=E3=81=AEphp7.3?= =?UTF-8?q?=E3=81=A7=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C=E5=87=BA=E3=82=8B?= =?UTF-8?q?=E3=81=9F=E3=82=81=E4=BF=AE=E6=AD=A3=20https://github.com/NetCo?= =?UTF-8?q?mmons3/NetCommons3/issues/1618?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 95d4afe..48b1c49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ php: - 7.0 - 7.1 - 7.2 - - 7.3 + - 7.3.24 - 7.4 sudo: false From 3b172fa119d49828e255c17ea8a77444f90deff9 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sat, 23 Jan 2021 14:06:56 +0900 Subject: [PATCH 14/26] =?UTF-8?q?add:=20release=E3=82=BF=E3=82=B0=E4=BB=98?= =?UTF-8?q?=E3=81=91=E3=81=AEgithub=20action=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/NetCommons3/NetCommons3/issues/1619 --- .github/workflows/release.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..a3225bc --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,28 @@ +on: + push: + # Sequence of patterns matched against refs/tags + tags: + - '3*' + +name: Create Release + +jobs: + build: + name: Create Release + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token + with: + tag_name: ${{ github.ref }} + release_name: ${{ github.ref }} + body: | + NetCommons ${{ github.ref }} released. + draft: false + prerelease: false From ffa8f4586a3b943b704420bead9add2cc5978361 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sat, 23 Jan 2021 14:07:01 +0900 Subject: [PATCH 15/26] change: Version number to 3.3.3 --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 4772543..619b537 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.3.2 +3.3.3 From bfb4cbb7577802b385a8533a1db2e76948e7da8f Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sun, 14 Feb 2021 18:40:40 +0900 Subject: [PATCH 16/26] =?UTF-8?q?fix:=20ToDo=E3=81=AE=E5=AE=8C=E4=BA=86?= =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=A7=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=82=8B=E3=81=9F=E3=82=81=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=20https://github.com/NetCommons3/NetCommons3/issues/1622?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/TaskProgressRateController.php | 5 +++++ View/Elements/TaskContents/task_content.ctp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Controller/TaskProgressRateController.php b/Controller/TaskProgressRateController.php index 1459945..8346c03 100644 --- a/Controller/TaskProgressRateController.php +++ b/Controller/TaskProgressRateController.php @@ -49,6 +49,11 @@ public function edit() { if ($this->request->is('post')) { $rateCondition = $this->params['named']; $key = $rateCondition['content_key']; + if (isset($rateCondition['progress_rate'])) { + $rateCondition['TaskContent']['progress_rate'] = $rateCondition['progress_rate']; + unset($rateCondition['progress_rate']); + } + // 一覧から完了ボタンの処理時にnamedから値を取得 $this->params['data'] = array_merge($this->params['data'], $rateCondition); $progressRate = $this->params['data']['TaskContent']['progress_rate']; diff --git a/View/Elements/TaskContents/task_content.ctp b/View/Elements/TaskContents/task_content.ctp index c7b75c8..f000e9d 100644 --- a/View/Elements/TaskContents/task_content.ctp +++ b/View/Elements/TaskContents/task_content.ctp @@ -38,7 +38,7 @@ echo $this->NetCommonsHtml->css('/tasks/css/tasks.css'); 'controller' => 'task_progress_rate', 'action' => 'edit', 'content_key' => h($content['TaskContent']['key']), - 'TaskContent' => array('progress_rate' => TasksComponent::TASK_COMPLETION_PROGRESS_RATE), + 'progress_rate' => TasksComponent::TASK_COMPLETION_PROGRESS_RATE, ); echo $this->NetCommonsForm->create( 'TaskProgressRate', array( From e6eda46001e470c7a58b6386000550becf7da31f Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sun, 14 Feb 2021 20:35:01 +0900 Subject: [PATCH 17/26] =?UTF-8?q?fix:=20test:=20UnitTest=E3=82=A8=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E4=BF=AE=E6=AD=A3=20https://github.com/NetCommons3/Ne?= =?UTF-8?q?tCommons3/issues/1622?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test/Case/Controller/TaskProgressRateController/EditTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test/Case/Controller/TaskProgressRateController/EditTest.php b/Test/Case/Controller/TaskProgressRateController/EditTest.php index 7d12b0c..cf03ebf 100644 --- a/Test/Case/Controller/TaskProgressRateController/EditTest.php +++ b/Test/Case/Controller/TaskProgressRateController/EditTest.php @@ -164,7 +164,7 @@ public function testEditPostNamed() { 'action' => 'edit', 'block_id' => $blockId, 'content_key' => 'task_content_key', - 'TaskContent' => array('progress_rate' => 100) + 'progress_rate' => 100 )); $params = array(); $this->testAction($url, $params); From 4806206087d61b509f1f7d385e62d20c07224421 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sat, 31 Jul 2021 17:11:34 +0900 Subject: [PATCH 18/26] =?UTF-8?q?change:=20test:=20TravisCI=E3=81=8B?= =?UTF-8?q?=E3=82=89GithubAction=E3=81=AB=E5=A4=89=E6=9B=B4=20https://gith?= =?UTF-8?q?ub.com/NetCommons3/NetCommons3/issues/1650?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 137 ++++++++++++++++++++++++++++++++++++ .travis.yml | 36 ---------- README.md | 13 +--- phpunit.xml.dist | 4 +- 4 files changed, 141 insertions(+), 49 deletions(-) create mode 100644 .github/workflows/tests.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..d6bd01e --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,137 @@ +on: + push: + branches: + - main + - master + - availability + pull_request: + branches: + - main + - master + - availability + +name: tests + +jobs: + tests: + name: tests + runs-on: ubuntu-18.04 + strategy: + matrix: + php: [ '7.1', '7.2', '7.3', '7.4' ] + + env: + NC3_BUILD_DIR: "/opt/nc3" + NC3_DOCKER_DIR: "/opt/docker" + NC3_GIT_URL: "git://github.com/NetCommons3/NetCommons3.git" + NC3_GIT_BRANCH: "master" + PLUGIN_BUILD_DIR: ${{ github.workspace }} + PHP_VERSION: ${{ matrix.php }} + MYSQL_ROOT_PASSWORD: root + MYSQL_DATABASE: cakephp_test + + steps: + - uses: actions/checkout@v2 + + - name: environment + run: | + echo "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}" + echo "PLUGIN_BUILD_DIR=${PLUGIN_BUILD_DIR}" + echo "PHP_VERSION=${PHP_VERSION}" + ls -al ${PLUGIN_BUILD_DIR} + + - name: docker-compose install + run: | + curl -L https://github.com/docker/compose/releases/download/1.11.2/docker-compose-`uname -s`-`uname -m` > ~/docker-compose + chmod +x ~/docker-compose + sudo mv ~/docker-compose /usr/local/bin/docker-compose + docker-compose --version + + - name: git clone nc3 + run: git clone -b ${NC3_GIT_BRANCH} ${NC3_GIT_URL} ${NC3_BUILD_DIR} + + - name: git clone nc3_docker + run: git clone https://github.com/NetCommons3/nc3app-docker.git ${NC3_DOCKER_DIR} + + - name: docker-compose start + run: | + cd ${NC3_DOCKER_DIR} + docker-compose up -d + docker-compose start + + - run: docker ps + + - name: check libraries + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/start-on-docker.sh + + - name: nc3 build + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/app-build.sh + + - name: phpcs (PHP CodeSniffer) + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/phpcs.sh + + - name: phpmd (PHP Mess Detector) + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/phpmd.sh + + - name: phpcpd (PHP Copy/Paste Detector) + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/phpcpd.sh + + - name: gjslint (JavaScript Style Check) + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/gjslint.sh + + - name: phpdoc (PHP Documentor) + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/phpdoc.sh + + - name: phpunit (PHP UnitTest) + run: | + cd ${NC3_DOCKER_DIR} + docker-compose exec -T nc3app bash /opt/scripts/phpunit.sh + sudo -s chmod a+w -R ${NC3_BUILD_DIR}/build + + - name: push coveralls + env: + COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} + COVERALLS_FLAG_NAME: ${{ matrix.php }} + run: | + cd ${NC3_BUILD_DIR} + ls -la ${NC3_BUILD_DIR} + vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v + + - name: docker-compose remove + run: | + cd ${NC3_DOCKER_DIR} + docker-compose rm -f + + # テスト成功時はこちらのステップが実行される + - name: Slack Notification on Success + if: success() + uses: rtCamp/action-slack-notify@v2.2.0 + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} + SLACK_CHANNEL: notify-netcommons3 + SLACK_TITLE: "${{ github.repository }}(${{ matrix.php }})" + SLACK_COLOR: good + + # テスト失敗時はこちらのステップが実行される + - name: Slack Notification on Failure + uses: rtCamp/action-slack-notify@v2.2.0 + if: failure() + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} + SLACK_CHANNEL: notify-netcommons3 + SLACK_TITLE: "${{ github.repository }}(${{ matrix.php }})" + SLACK_COLOR: danger diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 48b1c49..0000000 --- a/.travis.yml +++ /dev/null @@ -1,36 +0,0 @@ -language: php - -php: - - 7.0 - - 7.1 - - 7.2 - - 7.3.24 - - 7.4 - -sudo: false -dist: trusty - -env: - - NETCOMMONS_VERSION=master DB=mysql - -before_script: - - export NETCOMMONS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/NetCommons3 - - git clone git://github.com/NetCommons3/NetCommons3 $NETCOMMONS_BUILD_DIR - - cd $NETCOMMONS_BUILD_DIR - - git checkout $NETCOMMONS_VERSION - - travis_wait . tools/build/plugins/cakephp/travis/pre.sh - - . tools/build/plugins/cakephp/travis/environment.sh - -script: - - . tools/build/plugins/cakephp/travis/main.sh - -after_script: - - cp $TRAVIS_BUILD_DIR/phpunit.xml . - - . tools/build/plugins/cakephp/travis/post.sh - -notifications: - email: - recipients: - - netcommons3@googlegroups.com - on_success: never # default: change - on_failure: always # default: always diff --git a/README.md b/README.md index c0d3264..b218236 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,6 @@ Tasks ======= -Tasks for NetCommons3 - -[![Build Status](https://travis-ci.org/NetCommons3/Tasks.svg?branch=master)](https://travis-ci.org/NetCommons3/Tasks) -[![Coverage Status](https://img.shields.io/coveralls/NetCommons3/Tasks.svg)](https://coveralls.io/r/NetCommons3/Tasks?branch=master) - -| dependencies | status | -| ------------ | ------ | -| composer.json | [![Dependency Status](https://www.versioneye.com/user/projects/579098b9321a11000daa4867/badge.svg?style=flat)](https://www.versioneye.com/user/projects/579098b9321a11000daa4867) | - - +[![Tests Status](https://github.com/NetCommons3/Tasks/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/NetCommons3/Tasks/actions/workflows/tests.yml) +[![Coverage Status](https://coveralls.io/repos/NetCommons3/Tasks/badge.svg?branch=master)](https://coveralls.io/r/NetCommons3/Tasks?branch=master) +[![Stable Version](https://img.shields.io/packagist/v/netcommons/tasks.svg?label=stable)](https://packagist.org/packages/netcommons/tasks) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index b7cbc38..99f1a01 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -3,9 +3,6 @@ - - - app/Plugin/Tasks @@ -20,5 +17,6 @@ + From 2fe628b739cab51faec0af4d9c6d5ba84b91a69c Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 11 Aug 2021 14:47:29 +0900 Subject: [PATCH 19/26] =?UTF-8?q?change:=20test:=20Slack=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3,=20mysql8.0=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=20https://github.com/NetCommons3/NetCommons3?= =?UTF-8?q?/issues/1650?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 35 ++++++++++++++++++++++++-- .github/workflows/tests.yml | 47 +++++++++++++++++++++++++---------- 2 files changed, 67 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a3225bc..592d72f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,16 +4,25 @@ on: tags: - '3*' -name: Create Release +name: create_release jobs: build: - name: Create Release + name: create_release runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v2 + - name: Slack Notification on Start + uses: rtCamp/action-slack-notify@v2.2.0 + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_RELEASE }} + SLACK_CHANNEL: notify-nc3-release + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: "#f0ad4e" + SLACK_MESSAGE: "Start Job" + - name: Create Release id: create_release uses: actions/create-release@v1 @@ -26,3 +35,25 @@ jobs: NetCommons ${{ github.ref }} released. draft: false prerelease: false + + # テスト成功時はこちらのステップが実行される + - name: Slack Notification on Finish + uses: rtCamp/action-slack-notify@v2.2.0 + if: success() + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_RELEASE }} + SLACK_CHANNEL: notify-nc3-release + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: good + SLACK_MESSAGE: "Job Success" + + # テスト失敗時はこちらのステップが実行される + - name: Slack Notification on Failure + uses: rtCamp/action-slack-notify@v2.2.0 + if: failure() + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_RELEASE }} + SLACK_CHANNEL: notify-nc3-tests + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: danger + SLACK_MESSAGE: "Job Failure" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d6bd01e..1477ea2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,12 +13,26 @@ on: name: tests jobs: + setup: + name: setup + runs-on: ubuntu-18.04 + steps: + - name: Slack Notification on Start + uses: rtCamp/action-slack-notify@v2.2.0 + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} + SLACK_CHANNEL: notify-nc3-tests + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: "#f0ad4e" + tests: name: tests + needs: setup runs-on: ubuntu-18.04 strategy: matrix: php: [ '7.1', '7.2', '7.3', '7.4' ] + mysql: [ '5.7', '8.0' ] env: NC3_BUILD_DIR: "/opt/nc3" @@ -27,6 +41,7 @@ jobs: NC3_GIT_BRANCH: "master" PLUGIN_BUILD_DIR: ${{ github.workspace }} PHP_VERSION: ${{ matrix.php }} + MYSQL_VERSION: ${{ matrix.mysql }} MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: cakephp_test @@ -38,6 +53,7 @@ jobs: echo "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}" echo "PLUGIN_BUILD_DIR=${PLUGIN_BUILD_DIR}" echo "PHP_VERSION=${PHP_VERSION}" + echo "MYSQL_VERSION=${MYSQL_VERSION}" ls -al ${PLUGIN_BUILD_DIR} - name: docker-compose install @@ -116,22 +132,27 @@ jobs: cd ${NC3_DOCKER_DIR} docker-compose rm -f - # テスト成功時はこちらのステップが実行される - - name: Slack Notification on Success - if: success() - uses: rtCamp/action-slack-notify@v2.2.0 - env: - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - SLACK_CHANNEL: notify-netcommons3 - SLACK_TITLE: "${{ github.repository }}(${{ matrix.php }})" - SLACK_COLOR: good - # テスト失敗時はこちらのステップが実行される - name: Slack Notification on Failure uses: rtCamp/action-slack-notify@v2.2.0 if: failure() env: - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - SLACK_CHANNEL: notify-netcommons3 - SLACK_TITLE: "${{ github.repository }}(${{ matrix.php }})" + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} + SLACK_CHANNEL: notify-nc3-tests + SLACK_TITLE: "${{ github.repository }}(php${{ matrix.php }}, mysql${{ matrix.mysql }})" SLACK_COLOR: danger + + teardown: + name: teardown + runs-on: ubuntu-18.04 + needs: tests + steps: + # テスト成功時はこちらのステップが実行される + - name: Slack Notification on Success + if: success() + uses: rtCamp/action-slack-notify@v2.2.0 + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} + SLACK_CHANNEL: notify-nc3-tests + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: good From 42dc5d7cbd1bc5207e1bfefa2df3d66b26d2f1ec Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 13 Aug 2021 18:44:22 +0900 Subject: [PATCH 20/26] change: Version number to 3.3.4 --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 619b537..a0891f5 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.3.3 +3.3.4 From b9dfb11a73fda4f6b8162ff49ff2b99ea9d46746 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 11 Feb 2022 22:38:11 +0900 Subject: [PATCH 21/26] change: Version number to 3.3.5 --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index a0891f5..fa7adc7 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.3.4 +3.3.5 From 2e22b1b1f59fcf6222c5e79d02fcb69b3447831b Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 24 Feb 2023 17:13:04 +0900 Subject: [PATCH 22/26] =?UTF-8?q?test:=20Github=20Action=E3=82=A8=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1477ea2..7cfa881 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -44,10 +44,14 @@ jobs: MYSQL_VERSION: ${{ matrix.mysql }} MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: cakephp_test + COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 + - name: Fix up git URLs + run: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig + - name: environment run: | echo "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}" @@ -58,7 +62,7 @@ jobs: - name: docker-compose install run: | - curl -L https://github.com/docker/compose/releases/download/1.11.2/docker-compose-`uname -s`-`uname -m` > ~/docker-compose + curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-`uname -s`-`uname -m` > ~/docker-compose chmod +x ~/docker-compose sudo mv ~/docker-compose /usr/local/bin/docker-compose docker-compose --version From 5506051094eb384323922cecf4b5a67144279a8d Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 24 Feb 2023 22:43:15 +0900 Subject: [PATCH 23/26] =?UTF-8?q?test:=20Github=20Action=E3=82=A8=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test/Case/AllTasksTest.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Test/Case/AllTasksTest.php b/Test/Case/AllTasksTest.php index 34ff065..9fd8c75 100644 --- a/Test/Case/AllTasksTest.php +++ b/Test/Case/AllTasksTest.php @@ -9,6 +9,8 @@ * @copyright Copyright 2014, NetCommons Project */ +App::uses('NetCommonsTestSuite', 'NetCommons.TestSuite'); + /** * Tasks All Test Case * @@ -16,16 +18,16 @@ * @package NetCommons\Tasks\Test\Case * @codeCoverageIgnore */ -class AllTasksTest extends CakeTestSuite { +class AllTasksTest extends NetCommonsTestSuite { /** * All test suite * - * @return CakeTestSuite + * @return NetCommonsTestSuite */ public static function suite() { $plugin = preg_replace('/^All([\w]+)Test$/', '$1', __CLASS__); - $suite = new CakeTestSuite(sprintf('All %s Plugin tests', $plugin)); + $suite = new NetCommonsTestSuite(sprintf('All %s Plugin tests', $plugin)); $suite->addTestDirectoryRecursive(CakePlugin::path($plugin) . 'Test' . DS . 'Case'); return $suite; } From 72d1752c41bb24ba1c82c6d1ea56bb804243cbee Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sun, 26 Feb 2023 07:23:29 +0900 Subject: [PATCH 24/26] change: Version number to 3.3.6 --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index fa7adc7..9c25013 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.3.5 +3.3.6 From 22f7418af4d0fe72c2f6e99a2e06c4bfdb667fa2 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 6 Oct 2023 10:02:51 +0900 Subject: [PATCH 25/26] =?UTF-8?q?test:=20github=20action=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7cfa881..6da4321 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,22 +3,21 @@ on: branches: - main - master - - availability pull_request: branches: - main - master - - availability name: tests jobs: setup: name: setup - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - name: Slack Notification on Start uses: rtCamp/action-slack-notify@v2.2.0 + if: env.SLACK_WEBHOOK != '' env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} SLACK_CHANNEL: notify-nc3-tests @@ -28,7 +27,7 @@ jobs: tests: name: tests needs: setup - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest strategy: matrix: php: [ '7.1', '7.2', '7.3', '7.4' ] @@ -92,46 +91,53 @@ jobs: docker-compose exec -T nc3app bash /opt/scripts/app-build.sh - name: phpcs (PHP CodeSniffer) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpcs.sh - name: phpmd (PHP Mess Detector) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpmd.sh - name: phpcpd (PHP Copy/Paste Detector) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpcpd.sh - name: gjslint (JavaScript Style Check) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/gjslint.sh - name: phpdoc (PHP Documentor) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpdoc.sh - name: phpunit (PHP UnitTest) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpunit.sh sudo -s chmod a+w -R ${NC3_BUILD_DIR}/build - - name: push coveralls - env: - COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COVERALLS_FLAG_NAME: ${{ matrix.php }} - run: | - cd ${NC3_BUILD_DIR} - ls -la ${NC3_BUILD_DIR} - vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v +# - name: push coveralls +# env: +# COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# COVERALLS_FLAG_NAME: ${{ matrix.php }} +# run: | +# cd ${NC3_BUILD_DIR} +# ls -la ${NC3_BUILD_DIR} +# vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v - name: docker-compose remove + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose rm -f @@ -139,7 +145,7 @@ jobs: # テスト失敗時はこちらのステップが実行される - name: Slack Notification on Failure uses: rtCamp/action-slack-notify@v2.2.0 - if: failure() + if: env.SLACK_WEBHOOK != '' && failure() env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} SLACK_CHANNEL: notify-nc3-tests @@ -148,13 +154,13 @@ jobs: teardown: name: teardown - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest needs: tests steps: # テスト成功時はこちらのステップが実行される - name: Slack Notification on Success - if: success() uses: rtCamp/action-slack-notify@v2.2.0 + if: env.SLACK_WEBHOOK != '' && success() env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} SLACK_CHANNEL: notify-nc3-tests From ff845cf05bc7f1d011e8ba2c6d477e877ffab04b Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Tue, 10 Oct 2023 00:20:40 +0900 Subject: [PATCH 26/26] change: Version number to 3.3.7 --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 9c25013..86fb650 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.3.6 +3.3.7