From dde50c5ddd631cce6ddd0c509d35bdc38b639ae6 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Wed, 5 Jul 2023 10:38:58 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E3=83=A1=E3=83=BC=E3=83=AB=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=81=A7=E3=83=AB=E3=83=BC=E3=83=A0=E3=81=AE=E9=81=B8?= =?UTF-8?q?=E6=8A=9E=E3=81=8C=E5=8B=95=E4=BD=9C=E3=81=97=E3=81=AA=E3=81=8F?= =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20refs=20https://github.com/NetCommons3/Cale?= =?UTF-8?q?ndars/commit/703f1068ad7ad55adda0010322433387840ff0e7#diff-c94a?= =?UTF-8?q?8afd68cf523b9db149fd27516e62b61c3020f8e429673151511d0d81b074?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/CalendarMailSettings/edit.ctp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/View/CalendarMailSettings/edit.ctp b/View/CalendarMailSettings/edit.ctp index 3e84770..f3cdde4 100644 --- a/View/CalendarMailSettings/edit.ctp +++ b/View/CalendarMailSettings/edit.ctp @@ -35,7 +35,7 @@ $urlParams = array( $name) : ?> > NetCommonsHtml->link($name, - $urlParams + ['?' => ['room' => $key]] + array_merge_recursive($urlParams, ['?' => ['room' => $key]]) ); ?> From 74d3b0ed9c86bb8c0cf14842e05b57366158dd47 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Fri, 7 Jul 2023 17:00:36 +0900 Subject: [PATCH 2/3] fix: tests.yml --- .github/workflows/tests.yml | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7cfa881..7e11233 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: ubuntulatest 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: ubuntulatest strategy: matrix: php: [ '7.1', '7.2', '7.3', '7.4' ] @@ -92,46 +92,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 @@ -148,7 +155,7 @@ jobs: teardown: name: teardown - runs-on: ubuntu-18.04 + runs-on: ubuntulatest needs: tests steps: # テスト成功時はこちらのステップが実行される From 9a72bb804dd2ca4ab6315b97a813c21f455876f3 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Fri, 7 Jul 2023 17:14:14 +0900 Subject: [PATCH 3/3] fix: tests.yml --- .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 7e11233..91735a8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ name: tests jobs: setup: name: setup - runs-on: ubuntulatest + 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: ubuntulatest + runs-on: ubuntu-latest strategy: matrix: php: [ '7.1', '7.2', '7.3', '7.4' ] @@ -155,7 +155,7 @@ jobs: teardown: name: teardown - runs-on: ubuntulatest + runs-on: ubuntu-latest needs: tests steps: # テスト成功時はこちらのステップが実行される