Skip to content

Commit

Permalink
Apply flarum-cli audit fix (#3248)
Browse files Browse the repository at this point in the history
  • Loading branch information
askvortsov1 authored Jan 3, 2022
1 parent 7c3b51f commit af77214
Show file tree
Hide file tree
Showing 11 changed files with 101 additions and 313 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Core PHP

on: [workflow_dispatch, push, pull_request]

# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
# This will break your current script.
# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.

jobs:
run:
uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
with:
enable_backend_testing: true

backend_directory: .
20 changes: 20 additions & 0 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Core JS

on: [workflow_dispatch, push, pull_request]

# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
# This will break your current script.
# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.

jobs:
run:
uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
with:
enable_bundlewatch: true
enable_prettier: true
enable_typescript: true

frontend_directory: ./js
main_git_branch: main
secrets:
bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}
137 changes: 0 additions & 137 deletions .github/workflows/js.yml

This file was deleted.

45 changes: 0 additions & 45 deletions .github/workflows/pr_size_change.yml

This file was deleted.

79 changes: 0 additions & 79 deletions .github/workflows/test.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/vendor
composer.lock
composer.phar

.DS_Store
Thumbs.db
tests/.phpunit.result.cache
Expand Down
File renamed without changes.
15 changes: 14 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,21 @@
"dev-master": "1.x-dev"
},
"flarum-cli": {
"excludeScaffolding": [
"LICENSE.md",
"js/tsconfig.json",
"js/webpack.config.js"
],
"modules": {
"backendTesting": true
"backendTesting": true,
"js": true,
"gitConf": true,
"githubActions": true,
"prettier": true,
"typescript": true,
"bundlewatch": true,
"editorConfig": true,
"styleci": true
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion js/admin.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './src/common';
export * from './src/admin';
export * from './src/admin';
2 changes: 1 addition & 1 deletion js/forum.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './src/common';
export * from './src/forum';
export * from './src/forum';
Loading

0 comments on commit af77214

Please sign in to comment.