From 88f5dd03b9d9e6716f9e01d5df5dcd94e2704dd4 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Tue, 19 Sep 2023 09:20:47 +0900
Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E8=A9=B3=E7=B4=B0=E3=83=BB?=
=?UTF-8?q?=E3=82=B5=E3=83=A0=E3=83=8D=E3=82=A4=E3=83=AB=E3=82=92=E9=9D=9E?=
=?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=AB=E3=81=99=E3=82=8B=E3=81=A8=E4=B8=8D?=
=?UTF-8?q?=E8=A6=81=E3=81=AB=E3=81=AA=E3=82=8B=E3=82=BF=E3=82=B0=E3=82=92?=
=?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?=
=?UTF-8?q?=E3=81=AB=E4=BF=AE=E6=AD=A3=20https://github.com/NetCommons3/Ne?=
=?UTF-8?q?tCommons3/issues/1708?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
View/Elements/Topics/item.ctp | 2 ++
View/Elements/Topics/item_angularjs.ctp | 2 ++
2 files changed, 4 insertions(+)
diff --git a/View/Elements/Topics/item.ctp b/View/Elements/Topics/item.ctp
index e64e76c..ff1b9ca 100644
--- a/View/Elements/Topics/item.ctp
+++ b/View/Elements/Topics/item.ctp
@@ -57,6 +57,7 @@
+
+
diff --git a/View/Elements/Topics/item_angularjs.ctp b/View/Elements/Topics/item_angularjs.ctp
index 4598e33..bfab703 100644
--- a/View/Elements/Topics/item_angularjs.ctp
+++ b/View/Elements/Topics/item_angularjs.ctp
@@ -58,6 +58,7 @@
+
+
From 6bb356ae7b7428ade98376c84b4dcf39e5453162 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Tue, 19 Sep 2023 09:23:34 +0900
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E3=82=82=E3=81=A3=E3=81=A8=E3=81=BF?=
=?UTF-8?q?=E3=82=8B=E3=81=A7=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=9F?=
=?UTF-8?q?=E6=96=B0=E7=9D=80=E3=81=AB=E5=AF=BE=E3=81=97=E3=81=A6=E3=80=81?=
=?UTF-8?q?=E6=9C=AA=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3=E3=81=AE=E5=A0=B4?=
=?UTF-8?q?=E5=90=88=E3=81=AB=E3=83=8F=E3=83=B3=E3=83=89=E3=83=AB=E3=82=92?=
=?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF=E3=81=97=E3=81=A6=E3=82=82?=
=?UTF-8?q?=E3=83=9D=E3=83=83=E3=83=97=E3=82=A2=E3=83=83=E3=83=97=E3=81=8C?=
=?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=82=88?=
=?UTF-8?q?=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=80=82=20https://github.?=
=?UTF-8?q?com/NetCommons3/NetCommons3/issues/1674?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
View/Elements/Topics/item_angularjs.ctp | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/View/Elements/Topics/item_angularjs.ctp b/View/Elements/Topics/item_angularjs.ctp
index bfab703..d2a621d 100644
--- a/View/Elements/Topics/item_angularjs.ctp
+++ b/View/Elements/Topics/item_angularjs.ctp
@@ -51,9 +51,15 @@
From bc0e0a5942797bf7b946436440bf5ee0096905f6 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Tue, 19 Sep 2023 09:32:28 +0900
Subject: [PATCH 3/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 | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7cfa881..a4ab928 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' ]
@@ -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: ubuntu-latest
needs: tests
steps:
# テスト成功時はこちらのステップが実行される