From 527533992ce63bfe53c21e49b3fff3491a3da1f6 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Sun, 26 Feb 2023 08:03:49 +0900
Subject: [PATCH 1/3] 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 10d9b8280c4b67f67ae1b228c1098c21ba5fe88d Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Fri, 6 Oct 2023 13:50:00 +0900
Subject: [PATCH 2/3] =?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 | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9501566..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' ]
@@ -44,6 +43,7 @@ jobs:
         MYSQL_VERSION: ${{ matrix.mysql }}
         MYSQL_ROOT_PASSWORD: root
         MYSQL_DATABASE: cakephp_test
+        COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
       - uses: actions/checkout@v2
@@ -91,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
@@ -138,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
@@ -147,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 6bf21385e751c659a2f110478030ff02cc7c1425 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Tue, 10 Oct 2023 01:01:20 +0900
Subject: [PATCH 3/3] 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