Skip to content

Commit

Permalink
Merge pull request #1375 from krayin/cleanup
Browse files Browse the repository at this point in the history
chore: clean ups
  • Loading branch information
jitendra-webkul authored Aug 20, 2024
2 parents 198e676 + e3b6df2 commit 7ef39f1
Show file tree
Hide file tree
Showing 407 changed files with 383 additions and 14,309 deletions.
3 changes: 3 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ APP_URL=http://localhost
APP_TIMEZONE=Asia/Kolkata
APP_LOCALE=en

VITE_HOST=
VITE_PORT=

LOG_CHANNEL=stack
LOG_LEVEL=debug

Expand Down
14 changes: 10 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
* text=auto
*.css linguist-vendored
*.scss linguist-vendored
*.js linguist-vendored
* text=auto eol=lf

*.blade.php diff=html
*.css diff=css
*.html diff=html
*.md diff=markdown
*.php diff=php

/.github export-ignore
CHANGELOG.md export-ignore
.styleci.yml export-ignore
42 changes: 19 additions & 23 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ jobs:

services:
mysql:
image: mysql:5.7
image: mysql:8.0
env:
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: krayin_testing
MYSQL_USER: krayin
MYSQL_PASSWORD: secret
MYSQL_DATABASE: krayin
ports:
- 3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
Expand All @@ -34,39 +32,37 @@ jobs:
extensions: curl, gd, intl, mbstring, openssl, pdo, pdo_mysql, tokenizer, zip

- name: Composer Install
run: |
set -e
composer install --no-cache
run: composer install

- name: Set Testing Environment
run: |
cp .env.example .env.testing
set -e
sed -i "s|^\(DB_HOST=\s*\).*$|\1127.0.0.1|" .env.testing
sed -i "s|^\(DB_PORT=\s*\).*$|\1${{ job.services.mysql.ports['3306'] }}|" .env.testing
sed -i "s|^\(DB_DATABASE=\s*\).*$|\1krayin_testing|" .env.testing
sed -i "s|^\(DB_USERNAME=\s*\).*$|\1krayin|" .env.testing
sed -i "s|^\(DB_PASSWORD=\s*\).*$|\1secret|" .env.testing
cp .env.example .env
sed -i "s|^\(APP_ENV=\s*\).*$|\1testing|" .env
sed -i "s|^\(DB_HOST=\s*\).*$|\1127.0.0.1|" .env
sed -i "s|^\(DB_PORT=\s*\).*$|\1${{ job.services.mysql.ports['3306'] }}|" .env
sed -i "s|^\(DB_DATABASE=\s*\).*$|\1krayin|" .env
sed -i "s|^\(DB_USERNAME=\s*\).*$|\1root|" .env
sed -i "s|^\(DB_PASSWORD=\s*\).*$|\1root|" .env
- name: Key Generate
run: set -e && php artisan key:generate --env=testing
run: php artisan key:generate

- name: Complete Testing Env File
- name: Complete ENV File
run: |
printf "The complete `.env.testing` ... \n\n"
cat .env.testing
printf "The complete `.env` ... \n\n"
cat .env
- name: Migrate Database
run: set -e && php artisan migrate --env=testing
run: php artisan migrate

- name: Seed Database
run: set -e && php artisan db:seed --env=testing
run: php artisan db:seed

- name: Vendor Publish
run: set -e && php artisan vendor:publish --all --force --env=testing
run: php artisan vendor:publish --provider=Webkul\\Core\\Providers\\CoreServiceProvider --force

- name: Optimize Stuffs
run: set -e && php artisan optimize:clear --env=testing
run: php artisan optimize:clear

- name: Run Tests
run: set -e && vendor/bin/pest
run: vendor/bin/pest
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Homestead.yaml
/node_modules
npm-debug.log
package-lock.json
/public/css
/public/css
/public/js
/public/hot
/public/storage
Expand Down
6 changes: 1 addition & 5 deletions .styleci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,5 @@ php:
finder:
not-name:
- index.php
- server.php
js:
finder:
not-name:
- webpack.mix.js
js: true
css: true
4 changes: 1 addition & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,16 @@
"guzzlehttp/guzzle": "^7.0.1",
"konekt/concord": "^1.10",
"laravel/framework": "^10.0",
"laravel/pint": "^1.16",
"laravel/sanctum": "^3.2",
"laravel/tinker": "^2.5",
"laravel/ui": "^4.0",
"maatwebsite/excel": "^3.1",
"prettus/l5-repository": "^2.7.9"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.6",
"fakerphp/faker": "^1.9.1",
"krayin/krayin-package-generator": "dev-master",
"laravel/pint": "^1.16",
"laravel/sail": "^1.0.1",
"mockery/mockery": "^1.4.2",
"nunomaduro/collision": "^7.0",
Expand Down Expand Up @@ -64,7 +63,6 @@
"Webkul\\Product\\": "packages/Webkul/Product/src",
"Webkul\\Quote\\": "packages/Webkul/Quote/src",
"Webkul\\Tag\\": "packages/Webkul/Tag/src",
"Webkul\\UI\\": "packages/Webkul/UI/src",
"Webkul\\User\\": "packages/Webkul/User/src",
"Webkul\\Warehouse\\": "packages/Webkul/Warehouse/src",
"Webkul\\WebForm\\": "packages/Webkul/WebForm/src",
Expand Down
Loading

0 comments on commit 7ef39f1

Please sign in to comment.