Skip to content

Commit

Permalink
Merge pull request #376 from wayofdev/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
lotyp committed May 27, 2024
2 parents e3af628 + 02ce643 commit 832c680
Show file tree
Hide file tree
Showing 55 changed files with 5,290 additions and 4,361 deletions.
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ DB_PORT=5432
DB_DATABASE=wod
DB_USERNAME=wod
DB_PASSWORD=password
DB_FORWARD_PORT=5444

CACHE_DRIVER=file
FILESYSTEM_DISK=local
Expand Down
72 changes: 72 additions & 0 deletions .github/.release-please-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"release-type": "php",
"packages": {
".": {
"package-name": "laravel-starter-tpl",
"changelog-path": "/CHANGELOG.md"
}
},
"include-component-in-tag": false,
"changelog-sections": [
{
"type": "feat",
"section": "Features",
"hidden": false
},
{
"type": "fix",
"section": "Bug Fixes",
"hidden": false
},
{
"type": "perf",
"section": "Performance Improvements",
"hidden": false
},
{
"type": "docs",
"section": "Documentation",
"hidden": false
},
{
"type": "deps",
"section": "Dependencies",
"hidden": false
},
{
"type": "refactor",
"section": "Code Refactoring",
"hidden": false
},
{
"type": "test",
"section": "Tests",
"hidden": false
},
{
"type": "ci",
"section": "Continuous Integration",
"hidden": false
},
{
"type": "build",
"section": "Build System",
"hidden": true
},
{
"type": "chore",
"section": "Miscellaneous",
"hidden": true
},
{
"type": "style",
"section": "Styles",
"hidden": true
},
{
"type": "revert",
"section": "Reverts",
"hidden": true
}
]
}
3 changes: 3 additions & 0 deletions .github/.release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
".": "1.6.0"
}
15 changes: 10 additions & 5 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,18 @@
# this file is for the labeler workflow job
# Documentation https://github.com/marketplace/actions/labeler

"type: bug":
- head-branch: ['^bug', '^fix', 'bug', 'fix']

"type: enhancement":
- head-branch: ['^feature', '^feat', 'feature']

"type: documentation":
- assets/**/*
- .github/*
- ./*.md
- changed-files:
- any-glob-to-any-file: ['assets/**/*', '.github/*', './*.md']

"type: maintenance":
- .github/workflows/*
- app/tests/**/*
- changed-files:
- any-glob-to-any-file: ['app/tests/**/*', '.github/workflows/*']

...
2 changes: 1 addition & 1 deletion .github/workflows/apply-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ name: 🏷️ Add labels

jobs:
label:
uses: wayofdev/gh-actions/.github/workflows/apply-labels.yml@master
uses: wayofdev/gh-actions/.github/workflows/apply-labels.yml@v3.1.0
with:
os: ubuntu-latest
secrets:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: 📦 Check out the codebase
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: 🛠️ Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -41,14 +41,14 @@ jobs:
- name: ♻️ Restore cached backend dependencies
id: cached-composer-dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: vendor
key: vendor-${{ runner.os }}-${{ hashFiles('**/composer.lock') }}-${{ matrix.php }}

- name: ♻️ Restore cached .build directory
id: cached-build-dir
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: .build
key: build-${{ runner.os }}-${{ hashFiles('**/composer.lock') }}-${{ matrix.php }}
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
XDEBUG_MODE: "coverage"

- name: 📤 Upload coverage results to Codecov.io
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: true
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# https://github.com/wayofdev/gh-actions/blob/master/.github/workflows/create-release.yml
# https://github.com/google-github-actions/release-please-action#release-types-supported
# https://github.com/googleapis/release-please/blob/main/docs/customizing.md

on: # yamllint disable-line rule:truthy
push:
Expand All @@ -12,12 +13,15 @@ name: 📦 Create release

jobs:
release:
uses: wayofdev/gh-actions/.github/workflows/create-release.yml@master
with:
os: ubuntu-latest
branch: master
package-name: laravel-starter-tpl
secrets:
token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
runs-on: ubuntu-latest
steps:
- name: 🎉 Create release
uses: googleapis/release-please-action@v4.1.1
id: release
with:
token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
config-file: .github/.release-please-config.json
manifest-file: .github/.release-please-manifest.json
target-branch: master

...
4 changes: 2 additions & 2 deletions .github/workflows/deploy-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: 📦 Check out the codebase
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -35,7 +35,7 @@ jobs:

- name: ♻️ Restore cached backend dependencies
id: cached-composer-dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: vendor
key: vendor-${{ runner.os }}-${{ hashFiles('**/composer.lock') }}-${{ matrix.php }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: 📦 Check out the codebase
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -35,7 +35,7 @@ jobs:

- name: ♻️ Restore cached backend dependencies
id: cached-composer-dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: vendor
key: vendor-${{ runner.os }}-${{ hashFiles('**/composer.lock') }}-${{ matrix.php }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync-from-tpl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:

steps:
- name: 📦 Check out the codebase
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.WORKFLOW_TOKEN }}

- name: ♻️ Sync changes from upstream template
uses: AndreasAugustin/actions-template-sync@v0.8.0
uses: AndreasAugustin/actions-template-sync@v2.1.0
with:
github_token: ${{ secrets.WORKFLOW_TOKEN }}
source_repo_path: wayofdev/laravel-starter-tpl
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@
/.fleet
/.idea
/.vscode

/certs/*
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.6.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-added-large-files
- id: fix-encoding-pragma

- repo: https://github.com/commitizen-tools/commitizen
rev: 3.2.2
rev: v3.27.0
hooks:
- id: commitizen
stages:
Expand Down
12 changes: 6 additions & 6 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License
The MIT License (MIT)

Copyright (c) 2021 @lotyp <lotyp7.woop@gmail.com>
Copyright (c) 2021 "lotyp, Andrij Orlenko"<the@wayof.dev>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
35 changes: 18 additions & 17 deletions app/composer.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
{
"name": "laravel/laravel",
"name": "wayofdev/laravel-starter-tpl",
"type": "project",
"description": "The Laravel Framework.",
"description": "Laravel backend application template for building APIs.",
"keywords": ["framework", "laravel"],
"license": "MIT",
"require": {
"php": "^8.2",
"ext-pdo": "*",
"deployer/deployer": "^7.3",
"guzzlehttp/guzzle": "^7.7",
"laravel/framework": "^10.13",
"laravel/tinker": "^2.8",
"sentry/sentry-laravel": "^3.4",
"spatie/laravel-query-builder": "^5.2",
"spatie/laravel-route-attributes": "^1.18",
"deployer/deployer": "^7.4",
"guzzlehttp/guzzle": "^7.8",
"laravel/framework": "^10.48",
"laravel/tinker": "^2.9",
"sentry/sentry-laravel": "^4.5",
"spatie/laravel-fractal": "^6.2",
"spatie/laravel-query-builder": "^5.8",
"spatie/laravel-route-attributes": "^1.22",
"wayofdev/laravel-open-docs": "^2.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.31",
"ergebnis/composer-normalize": "^2.42",
"fakerphp/faker": "^1.23",
"mockery/mockery": "^1.6",
"nunomaduro/collision": "^7.5",
"nunomaduro/larastan": "^2.6",
"pestphp/pest-plugin-laravel": "^2.0",
"nunomaduro/collision": "^7.10",
"larastan/larastan": "^2.9",
"pestphp/pest-plugin-laravel": "^2.4",
"phpstan/extension-installer": "^1.3",
"phpstan/phpstan-deprecation-rules": "^1.1",
"phpunit/phpunit": "^10.2",
"phpstan/phpstan-deprecation-rules": "^1.2",
"phpunit/phpunit": "^10.5",
"roave/security-advisories": "dev-latest",
"spatie/laravel-ignition": "^2.1",
"wayofdev/cs-fixer-config": "^1.2"
"spatie/laravel-ignition": "^2.7",
"wayofdev/cs-fixer-config": "^1.4"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 832c680

Please sign in to comment.