Skip to content

Commit

Permalink
Merge ours for package.json, package-lock.json, composer.json, and co…
Browse files Browse the repository at this point in the history
…mposer.lock in the stubs/.gitattributes.stub file. (#9)
  • Loading branch information
thejmitchener authored and fuelviews-app[bot] committed Nov 13, 2024
0 parents commit 0742018
Show file tree
Hide file tree
Showing 43 changed files with 11,374 additions and 0 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false

[*.{yml,yaml}]
indent_size = 2
28 changes: 28 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Path-based git attributes
# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html

# Ignore all test and documentation with "export-ignore".
/.github export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/phpunit.xml.dist export-ignore
/art export-ignore
/docs export-ignore
/tests export-ignore
/workbench export-ignore
/.editorconfig export-ignore
/.php_cs.dist.php export-ignore
/psalm.xml export-ignore
/psalm.xml.dist export-ignore
/testbench.yaml export-ignore
/UPGRADING.md export-ignore
/phpstan.neon.dist export-ignore
/phpstan-baseline.neon export-ignore

# Merge ours
# *.css merge=ours
# *.js merge=ours
# package.json merge=ours
# package-lock.json merge=ours
# composer.json merge=ours
# composer.lock merge=ours
66 changes: 66 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: Bug Report
description: Report an Issue or Bug with the Package
title: "[Bug]: "
labels: ["bug"]
body:
- type: markdown
attributes:
value: |
We're sorry to hear you have a problem. Can you help us solve it by providing the following details.
- type: textarea
id: what-happened
attributes:
label: What happened?
description: What did you expect to happen?
placeholder: I cannot currently do X thing because when I do, it breaks X thing.
validations:
required: true
- type: textarea
id: how-to-reproduce
attributes:
label: How to reproduce the bug
description: How did this occur, please add any config values used and provide a set of reliable steps if possible.
placeholder: When I do X I see Y.
validations:
required: true
- type: input
id: package-version
attributes:
label: Package Version
description: What version of our Package are you running? Please be as specific as possible
placeholder: 2.0.0
validations:
required: true
- type: input
id: php-version
attributes:
label: PHP Version
description: What version of PHP are you running? Please be as specific as possible
placeholder: 8.2.0
validations:
required: true
- type: input
id: laravel-version
attributes:
label: Laravel Version
description: What version of Laravel are you running? Please be as specific as possible
placeholder: 9.0.0
validations:
required: true
- type: dropdown
id: operating-systems
attributes:
label: Which operating systems does with happen with?
description: You may select more than one.
multiple: true
options:
- macOS
- Windows
- Linux
- type: textarea
id: notes
attributes:
label: Notes
description: Use this field to provide any other notes that you feel might be relevant to the issue.
validations:
required: false
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
blank_issues_enabled: false
contact_links:
- name: Ask a question
url: https://github.com/Fuelviews/app-init/discussions/new?category=q-a
about: Ask the community for help
- name: Request a feature
url: https://github.com/Fuelviews/app-init/discussions/new?category=ideas
about: Share ideas for new features
- name: Report a security issue
url: https://github.com/Fuelviews/app-init/security/policy
about: Learn how to notify us for sensitive bugs
17 changes: 17 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: 2
updates:
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: 'weekly'
target-branch: main
- package-ecosystem: 'composer'
directory: '/'
schedule:
interval: 'weekly'
target-branch: main
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: 'weekly'
target-branch: main
1 change: 1 addition & 0 deletions .github/funding.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github: Fuelviews
50 changes: 50 additions & 0 deletions .github/workflows/auto-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Auto Tag and Release

on:
workflow_dispatch:

pull_request:
types: [closed]
branches:
- main
paths-ignore:
- '.github/**'

jobs:
release:
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest
permissions:
contents: write

steps:
- name: Get Token
id: get_workflow_token
uses: peter-murray/workflow-application-token-action@v4
with:
application_id: ${{ vars.FUELVIEWS_BOT_APP_ID}}
application_private_key: ${{ secrets.FUELVIEWS_BOT_APP_PRIVATE_KEY }}

- uses: actions/checkout@v4
with:
ref: 'main'
fetch-depth: '0'

- name: Bump version and push tag
id: bump_version
uses: anothrNick/[email protected]
env:
GITHUB_TOKEN: ${{ steps.get_workflow_token.outputs.token }}
DEFAULT_BUMP: patch
WITH_V: true
RELEASE_BRANCHES: main

- name: Release
id: release
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ steps.get_workflow_token.outputs.token }}
with:
tag_name: ${{ steps.bump_version.outputs.new_tag }}
generate_release_notes: true

55 changes: 55 additions & 0 deletions .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Dependabot Auto-merge

on:
workflow_dispatch:

pull_request:
branches:
- main

permissions:
pull-requests: write
contents: write
checks: read

jobs:
dependabot:
runs-on: ubuntu-latest
timeout-minutes: 10
if: github.actor == 'dependabot[bot]'

steps:
- name: wait-for-checks
uses: poseidon/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Checkout the code
uses: actions/checkout@v4

- name: Dependabot metadata
id: metadata
uses: dependabot/[email protected]
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

- name: Auto-merge Dependabot PRs for indirect updates
if: ${{ steps.metadata.outputs.dependency-type == 'indirect' }}
run: gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Auto-merge Dependabot PRs for semver-minor updates
if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-minor' }}
run: gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Auto-merge Dependabot PRs for semver-patch updates
if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' }}
run: gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30 changes: 30 additions & 0 deletions .github/workflows/fix-php-code-style-issues.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Fix PHP Code Style Issues

on:
workflow_dispatch:

pull_request:
branches:
- main

permissions:
contents: write

jobs:
php-code-styling:
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}

- name: Fix PHP code style issues
uses: aglipanci/[email protected]

- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: Fix styling
22 changes: 22 additions & 0 deletions .github/workflows/open-ai-pr-description.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Autofill PR Description

on:
workflow_dispatch:

pull_request:
branches:
- main

permissions:
pull-requests: write
contents: write

jobs:
openai-pr-description:
runs-on: ubuntu-22.04
if: ${{ github.actor != 'dependabot[bot]' || github.actor != 'dependabot' }}
steps:
- uses: platisd/openai-pr-description@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
openai_api_key: ${{ secrets.OPEN_AI_PR_DESCRIPTION_API_KEY }}
50 changes: 50 additions & 0 deletions .github/workflows/rebase-development.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Rebase Development

on:
workflow_dispatch:

permissions:
contents: write

jobs:
update:
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- name: Get Token
id: get_workflow_token
uses: peter-murray/workflow-application-token-action@v4
with:
application_id: ${{ vars.FUELVIEWS_BOT_APP_ID }}
application_private_key: ${{ secrets.FUELVIEWS_BOT_APP_PRIVATE_KEY }}

- name: Checkout code
uses: actions/checkout@v4
with:
ref: 'main'
fetch-depth: '0'
token: ${{ steps.get_workflow_token.outputs.token }}

- name: Configure Git for auto-rebase and conflict resolution
run: |
git config pull.rebase true
git config user.name "fuelviews-app[bot]"
git config user.email "fuelviews-app[bot]@users.noreply.github.com"
- name: Checkout development branch
run: |
git fetch origin development
git checkout development
- name: Rebase development from main using "ours" strategy
run: |
git rebase -X ours main
env:
GITHUB_TOKEN: ${{ steps.get_workflow_token.outputs.token }}

- name: Push updated development branch
run: |
git push origin development --force-with-lease
env:
GITHUB_TOKEN: ${{ steps.get_workflow_token.outputs.token }}
Loading

0 comments on commit 0742018

Please sign in to comment.