From 5f024cfc38bee88028587ce9d1309a147324e86b Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 7 Apr 2023 09:22:17 +0900 Subject: [PATCH 1/5] =?UTF-8?q?test:=20=E3=80=8CWaiting=20for=20a=20runner?= =?UTF-8?q?=20to=20pick=20up=20this=20job...=E3=80=8D=E3=81=8C=E3=81=A7?= =?UTF-8?q?=E3=81=A6Github=20Action=E3=81=8C=E5=8B=95=E3=81=8B=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=81=9F=E3=82=81=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, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7cfa881..3b2212b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ 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 @@ -28,7 +28,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' ] @@ -148,7 +148,7 @@ jobs: teardown: name: teardown - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest needs: tests steps: # テスト成功時はこちらのステップが実行される From 7cf37287ff9bd5235231c495fefb356dc1e71885 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 7 Apr 2023 09:22:55 +0900 Subject: [PATCH 2/5] =?UTF-8?q?test:=20phpcs=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Behavior/WorkflowBehavior.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Behavior/WorkflowBehavior.php b/Model/Behavior/WorkflowBehavior.php index ac32061..325eeba 100644 --- a/Model/Behavior/WorkflowBehavior.php +++ b/Model/Behavior/WorkflowBehavior.php @@ -236,7 +236,7 @@ public function getWorkflowConditions( Model $model, $conditions = array(), $useCommentCreatable = false - ) { + ) { if (Current::permission('content_editable')) { $activeConditions = array(); $latestConditons = array( From 11504b7641c452389fa91ec3f38161255e8a9c2f Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 7 Apr 2023 09:30:13 +0900 Subject: [PATCH 3/5] =?UTF-8?q?test:=20github=20action=E3=81=A7=E9=80=94?= =?UTF-8?q?=E4=B8=AD=E3=81=A7=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=82=82=E5=BE=8C=E7=B6=9A=E3=81=AB=E9=80=B2?= =?UTF-8?q?=E3=82=80=E3=82=88=E3=81=86=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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3b2212b..7ca9b19 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -92,37 +92,44 @@ 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 + if: success() env: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} COVERALLS_FLAG_NAME: ${{ matrix.php }} From a26177fb494a5e08386eebb96412a87695778331 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 7 Apr 2023 09:36:11 +0900 Subject: [PATCH 4/5] =?UTF-8?q?test:=20github=20action=E3=81=A7=E9=80=94?= =?UTF-8?q?=E4=B8=AD=E3=81=A7=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=82=82=E5=BE=8C=E7=B6=9A=E3=81=AB=E9=80=B2?= =?UTF-8?q?=E3=82=80=E3=82=88=E3=81=86=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 | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7ca9b19..77f9121 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -139,6 +139,7 @@ jobs: 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 From ce0258bec443361efa6973843cea58eab5b5c4f9 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 7 Apr 2023 09:38:03 +0900 Subject: [PATCH 5/5] =?UTF-8?q?test:=20phpmd=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Behavior/WorkflowBehavior.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Model/Behavior/WorkflowBehavior.php b/Model/Behavior/WorkflowBehavior.php index 325eeba..5d55d44 100644 --- a/Model/Behavior/WorkflowBehavior.php +++ b/Model/Behavior/WorkflowBehavior.php @@ -18,6 +18,7 @@ * * @author Shohei Nakajima * @package NetCommons\Workflow\Model\Befavior + * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) */ class WorkflowBehavior extends ModelBehavior {