From e75c6a7facb704e046bb036f587f542c6b8b957a Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 1 Oct 2022 18:03:51 +0200 Subject: [PATCH] update workflows --- .github/workflows/main.yml | 58 +++++++++++++++---- .../Shop/Themes/Default/tpl/privacy.tpl.php | 2 +- .../Shop/Themes/Default/tpl/terms.tpl.php | 4 +- 3 files changed, 49 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e3fe96..54665b3 100755 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,6 @@ -name: CI/CD +name: CI -on: [push] +on: [push, pull_request] jobs: autoformat: @@ -226,25 +226,59 @@ jobs: - run: npm install - name: eslint run: npx eslint ./ -c Build/Config/.eslintrc.json - linting: +# linting: +# runs-on: ubuntu-latest +# if: "!contains(github.event.head_commit.message, 'NO_CI')" +# strategy: +# fail-fast: false +# max-parallel: 3 +# steps: +# - name: Checkout Repository +# uses: actions/checkout@main +# with: +# fetch-depth: 0 +# submodules: recursive +# token: ${{ secrets.GH_TOKEN }} +# - name: Lint Code Base +# uses: github/super-linter/slim@v4 +# env: +# VALIDATE_ALL_CODEBASE: false +# VALIDATE_PHP: true +# VALIDATE_PHP_BUILTIN: true +# DEFAULT_BRANCH: develop +# GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} + custom: runs-on: ubuntu-latest if: "!contains(github.event.head_commit.message, 'NO_CI')" strategy: fail-fast: false max-parallel: 3 + matrix: + php-versions: ['8.1'] steps: - name: Checkout Repository uses: actions/checkout@main with: - fetch-depth: 0 - submodules: recursive - token: ${{ secrets.GH_PAT }} - - name: Lint Code Base - uses: github/super-linter/slim@v4 - env: - VALIDATE_ALL_CODEBASE: false - DEFAULT_BRANCH: develop - GITHUB_TOKEN: ${{ secrets.GH_PAT }} + fetch-depth: 1 + - name: Checkout Build Repository + uses: actions/checkout@main + with: + fetch-depth: 1 + ref: develop + repository: Karaka-Management/Build + path: Build + - name: Setup PHP, with composer and extensions + uses: shivammathur/setup-php@master + with: + php-version: ${{ matrix.php-versions }} + extensions: mbstring, gd, zip, dom, mysql, pgsql, sqlite, bcmath, redis, memcached + ini-values: opcache.jit_buffer_size=256M, opcache.jit=1235, pcre.jit=1 + - name: PHP linting + run: | + find ./ -type f \ + -name '*.php' -print0 | xargs -0 -n1 -P4 php -l -n | (! grep -v "No syntax errors detected" ) + - name: Php strict + run: if [[ $(grep -r -L "declare(strict_types=1);" --include=*.php --exclude={*.tpl.php,*Hooks.php,*Routes.php,*SearchCommands.php} ./) -ne "" ]]; then exit 1; fi custom: runs-on: ubuntu-latest if: "!contains(github.event.head_commit.message, 'NO_CI')" diff --git a/Admin/Install/Application/Shop/Themes/Default/tpl/privacy.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/privacy.tpl.php index ad3ac8a..0cdb441 100755 --- a/Admin/Install/Application/Shop/Themes/Default/tpl/privacy.tpl.php +++ b/Admin/Install/Application/Shop/Themes/Default/tpl/privacy.tpl.php @@ -90,6 +90,6 @@ declare(strict_types=1);

By continuing to access or use Our SERVICE after those revisions become effective, You agree to be bound by the revised policies. If You do not agree to the new policies, in whole or in part, please stop using the WEBSITE and the SERVICE.

Contact

-

For questions regarding these POLICIES please feel free to contact us at info@karaka.email

+

For questions regarding these POLICIES please feel free to contact us at info@jingga.app

\ No newline at end of file diff --git a/Admin/Install/Application/Shop/Themes/Default/tpl/terms.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/terms.tpl.php index 337fd67..c509f90 100755 --- a/Admin/Install/Application/Shop/Themes/Default/tpl/terms.tpl.php +++ b/Admin/Install/Application/Shop/Themes/Default/tpl/terms.tpl.php @@ -76,7 +76,7 @@ declare(strict_types=1);

By continuing to access or use Our SERVICE after those revisions become effective, You agree to be bound by the revised terms. If You do not agree to the new terms, in whole or in part, please stop using the WEBSITE and the SERVICE.

Contact

-

For questions regarding these TERMS please feel free to contact us at info@karaka.email

, privacy policies, or practices of any third party websites or services. You further acknowledge and agree that the COMPANY shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with the use of or reliance on any such content, goods or services available on or through any such websites or services.

+

For questions regarding these TERMS please feel free to contact us at info@jingga.app

, privacy policies, or practices of any third party websites or services. You further acknowledge and agree that the COMPANY shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with the use of or reliance on any such content, goods or services available on or through any such websites or services.

We strongly advise You to read the terms and conditions and privacy policies of any third-party web sites or services that You visit.

Termination

@@ -108,6 +108,6 @@ declare(strict_types=1);

By continuing to access or use Our SERVICE after those revisions become effective, You agree to be bound by the revised terms. If You do not agree to the new terms, in whole or in part, please stop using the WEBSITE and the SERVICE.

Contact

-

For questions regarding these TERMS please feel free to contact us at info@karaka.email

+

For questions regarding these TERMS please feel free to contact us at info@jingga.app

\ No newline at end of file