Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.x] Upgrade to new structure #34

Merged
merged 4 commits into from
Jun 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 7 additions & 5 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
* text=auto

.github/ export-ignore
.run/ export-ignore
tests/ export-ignore

app/ export-ignore
docs/ export-ignore
tests/ export-ignore
excludes/ export-ignore

.codecov.yml export-ignore
.editorconfig export-ignore
.env.example export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.styleci.yml export-ignore

phpunit.php export-ignore
package.json export-ignore

phpunit.xml export-ignore
11 changes: 8 additions & 3 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
name: phpunit
on: [ push, pull_request ]

on: [ push ]

permissions: read-all

jobs:
build:
laravel:
runs-on: ubuntu-latest

name: PHP Unit
Expand All @@ -16,9 +19,11 @@ jobs:
with:
extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv, json
coverage: none
env:
COMPOSER_TOKEN: ${{ secrets.COMPOSER_TOKEN }}

- name: Install dependencies
run: composer update --prefer-stable --prefer-dist --no-progress --no-interaction

- name: Execute tests
run: sudo vendor/bin/phpunit
run: sudo vendor/bin/phpunit --colors=always
32 changes: 4 additions & 28 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
branches:
- main

permissions: write-all

jobs:
update:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -33,43 +35,19 @@ jobs:
run: |
IS_DIRTY=1

php app/keys.php
vendor/bin/lang sync

{ git add . && git commit -a -m "Updating translations keys"; } || IS_DIRTY=0

echo ::set-output name=is_dirty::${IS_DIRTY}

- name: Updating referents
id: referents
if: success()
run: |
IS_DIRTY=1

php app/referents.php

{ git add . && git commit -a -m "Updating the docs/referents.md file"; } || IS_DIRTY=0

echo ::set-output name=is_dirty::${IS_DIRTY}

- name: Checking for excludes
id: excludes
if: success()
run: |
IS_DIRTY=1

php app/excludes.php

{ git add . && git commit -a -m "Updating excludes files"; } || IS_DIRTY=0

echo ::set-output name=is_dirty::${IS_DIRTY}

- name: Update statuses
id: status
if: success()
run: |
IS_DIRTY=1

php app/status.php
vendor/bin/lang status

{ git add . && git commit -a -m "Updated status of translations"; } || IS_DIRTY=0

Expand All @@ -79,9 +57,7 @@ jobs:
uses: ad-m/github-push-action@master
if: |
success() && (
steps.excludes.outputs.is_dirty == 1 ||
steps.keys.outputs.is_dirty == 1 ||
steps.referents.outputs.is_dirty == 1 ||
steps.status.outputs.is_dirty == 1
)
with:
Expand Down
17 changes: 14 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
.idea/

vendor/
_site/
build/
node_modules/
vendor/

.cache
.DS_Store
.env
.php_cs.cache
.phpintel
.temp

*.bak
*.cache
*.clover
*.lock
*.orig

composer.lock
package-lock.json
7 changes: 0 additions & 7 deletions app/.env.example

This file was deleted.

3 changes: 0 additions & 3 deletions app/.gitignore

This file was deleted.

16 changes: 0 additions & 16 deletions app/add.php

This file was deleted.

7 changes: 0 additions & 7 deletions app/bootstrap/app.php

This file was deleted.

5 changes: 0 additions & 5 deletions app/bootstrap/autoload.php

This file was deleted.

10 changes: 0 additions & 10 deletions app/excludes.php

This file was deleted.

10 changes: 0 additions & 10 deletions app/keys.php

This file was deleted.

87 changes: 0 additions & 87 deletions app/main/Application.php

This file was deleted.

38 changes: 0 additions & 38 deletions app/main/Concerns/Contains.php

This file was deleted.

Loading