diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..592d72f --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,59 @@ +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: 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 + 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 + + # テスト成功時はこちらのステップが実行される + - 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 new file mode 100644 index 0000000..eb2068b --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,170 @@ +on: + push: + branches: + - main + - master + - availability + pull_request: + branches: + - main + - master + - availability + +name: tests + +jobs: + setup: + name: setup + 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 + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: "#f0ad4e" + + tests: + name: tests + needs: setup + runs-on: ubuntu-latest + strategy: + matrix: + php: [ '7.1', '7.2', '7.3', '7.4' ] + mysql: [ '5.7', '8.0' ] + + 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_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}" + 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 + run: | + 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 + + - 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) + 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: docker-compose remove + if: always() + run: | + cd ${NC3_DOCKER_DIR} + docker-compose rm -f + + # テスト失敗時はこちらのステップが実行される + - name: Slack Notification on Failure + uses: rtCamp/action-slack-notify@v2.2.0 + if: env.SLACK_WEBHOOK != '' && failure() + env: + 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-latest + needs: tests + steps: + # テスト成功時はこちらのステップが実行される + - name: Slack Notification on 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 + SLACK_TITLE: "${{ github.repository }}" + SLACK_COLOR: good diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 43cef8a..0000000 --- a/.travis.yml +++ /dev/null @@ -1,41 +0,0 @@ -language: php - -php: - - 5.4 - - 5.5 - - 5.6 - - 7.0 - - 7.1 - -sudo: required - -env: - matrix: - - NETCOMMONS_VERSION=master DB=mysql - global: - - secure: "mm0KmIvK9syy2RwjodMnPOSMETtOASsB5Q4Ul0PFJpmAqyRROkGcSdysEk674u0rysnP9Bb28mCtQzYypDAbB9MWMSEfHBtmYgyZMAgLlS1b+Ou2gOBX/r+OL6mcep1jcE/v/Zo0EhySNBehhoNayh5zwJwrKOPkdH9lp7Hobvk=" - - GIT_COMMITTER_NAME=s-nakajima - - GIT_COMMITTER_EMAIL=nakajimashouhei@gmail.com - - GIT_AUTHOR_NAME=s-nakajima - - GIT_AUTHOR_EMAIL=nakajimashouhei@gmail.com - -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: - - . 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/Controller/Component/ControlPanelLayoutComponent.php b/Controller/Component/ControlPanelLayoutComponent.php index de16a83..11117f3 100644 --- a/Controller/Component/ControlPanelLayoutComponent.php +++ b/Controller/Component/ControlPanelLayoutComponent.php @@ -49,7 +49,7 @@ public function beforeRender(Controller $controller) { 'default_action' => 'control_panel/index' ]; - $this->plugins = $controller->Plugin->find('all', array( + $this->plugins = $controller->Plugin->cacheFindQuery('all', array( 'recursive' => -1, 'fields' => array( $controller->Plugin->alias . '.key', diff --git a/README.md b/README.md index 47773fa..014461e 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,6 @@ ControlPanel ============== -ControlPanel for NetComomns3 - -[![Build Status](https://api.travis-ci.org/NetCommons3/ControlPanel.png?branch=master)](https://travis-ci.org/NetCommons3/ControlPanel) -[![Coverage Status](https://coveralls.io/repos/NetCommons3/ControlPanel/badge.png?branch=master)](https://coveralls.io/r/NetCommons3/ControlPanel?branch=master) - -| dependencies | status | -| ------------- | ------ | -| composer.json | [![Dependency Status](https://www.versioneye.com/user/projects/55cba1bf49163d000d0001e8/badge.png)](https://www.versioneye.com/user/projects/55cba1bf49163d000d0001e8) | +[![Tests Status](https://github.com/NetCommons3/ControlPanel/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/NetCommons3/ControlPanel/actions/workflows/tests.yml) +[![Coverage Status](https://coveralls.io/repos/NetCommons3/ControlPanel/badge.svg?branch=master)](https://coveralls.io/r/NetCommons3/ControlPanel?branch=master) +[![Stable Version](https://img.shields.io/packagist/v/netcommons/control-panel.svg?label=stable)](https://packagist.org/packages/netcommons/control-panel) diff --git a/Test/Case/Controller/ControlPanelController/IndexTest.php b/Test/Case/Controller/ControlPanelController/IndexTest.php index dc85bcf..5e04324 100644 --- a/Test/Case/Controller/ControlPanelController/IndexTest.php +++ b/Test/Case/Controller/ControlPanelController/IndexTest.php @@ -56,11 +56,6 @@ public function setUp() { )); CakeSession::write('getNotificationError', null); - - $this->controller->Notification = $this->getMockForModel('Notifications.Notification', - array('validCacheTime', 'ping', 'serialize', 'updateNotifications')); - $this->_mockForReturn('Notifications.Notification', 'validCacheTime', false); - $this->_mockForReturn('Notifications.Notification', 'ping', true); } /** @@ -69,6 +64,11 @@ public function setUp() { * @return void */ public function testIndex() { + $this->controller->Notification = $this->getMockForModel('Notifications.Notification', + array('validCacheTime', 'ping', 'serialize', 'updateNotifications')); + $this->_mockForReturn('Notifications.Notification', 'validCacheTime', false); + $this->_mockForReturn('Notifications.Notification', 'ping', true); + TestAuthGeneral::login($this, UserRole::USER_ROLE_KEY_SYSTEM_ADMINISTRATOR); //Mockの設定 @@ -94,6 +94,11 @@ public function testIndex() { * @throws XmlException */ public function testIndexOnXmlException() { + $this->controller->Notification = $this->getMockForModel('Notifications.Notification', + array('validCacheTime', 'ping', 'serialize', 'updateNotifications')); + $this->_mockForReturn('Notifications.Notification', 'validCacheTime', false); + $this->_mockForReturn('Notifications.Notification', 'ping', true); + TestAuthGeneral::login($this, UserRole::USER_ROLE_KEY_SYSTEM_ADMINISTRATOR); //Mockの設定 @@ -115,14 +120,16 @@ public function testIndexOnXmlException() { * ログインなしのテスト * * @return void - * @throws XmlException */ public function testIndexWOLogin() { //テスト実行 - $this->_testNcAction('/control_panel/control_panel/index', array( - 'method' => 'get' - )); - - $this->assertEqual(substr($this->headers['Location'], -5), 'login'); + $this->_testNcAction( + '/control_panel/control_panel/index', + array( + 'method' => 'get' + ), + 'ForbiddenException' + ); + //$this->assertEqual(substr($this->headers['Location'], -5), 'login'); } } diff --git a/VERSION.txt b/VERSION.txt new file mode 100644 index 0000000..86fb650 --- /dev/null +++ b/VERSION.txt @@ -0,0 +1 @@ +3.3.7 diff --git a/View/Layouts/default.ctp b/View/Layouts/default.ctp index 05be4d4..d01d850 100644 --- a/View/Layouts/default.ctp +++ b/View/Layouts/default.ctp @@ -19,7 +19,7 @@ <?php echo (isset($pageTitle) ? h($pageTitle) . ' - ' . SiteSettingUtil::read('App.site_name') : ''); ?> html->meta('icon', '/net_commons/favicon.ico'); + echo $this->element('NetCommons.common_favicon'); echo $this->fetch('meta'); echo $this->element('NetCommons.common_css'); diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f8faf20..566dac6 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,5 +1,8 @@ + + + app/Plugin/ControlPanel @@ -14,6 +17,6 @@ - +