migrate to main branch

This commit is contained in:
Maxime GRIS
2022-03-13 14:09:05 +01:00
parent ff71c32872
commit 2c7cd9857e
6 changed files with 21 additions and 22 deletions

View File

@@ -8,6 +8,9 @@ indent_size = 2
insert_final_newline = true insert_final_newline = true
trim_trailing_whitespace = true trim_trailing_whitespace = true
[*.ts]
quote_type = single
[*.md] [*.md]
max_line_length = off max_line_length = off
trim_trailing_whitespace = false trim_trailing_whitespace = false

View File

@@ -3,13 +3,13 @@ name: 'MacOS Build'
# Controls when the action will run. # Controls when the action will run.
on: on:
# Triggers the workflow on push or pull request events but only for the master branch # Triggers the workflow on push or pull request events but only for the main branch
push: push:
branches: branches:
- master - main
pull_request: pull_request:
branches: branches:
- master - main
# Allows you to run this workflow manually from the Actions tab # Allows you to run this workflow manually from the Actions tab
workflow_dispatch: workflow_dispatch:

View File

@@ -3,13 +3,13 @@ name: 'Linux Build'
# Controls when the action will run. # Controls when the action will run.
on: on:
# Triggers the workflow on push or pull request events but only for the master branch # Triggers the workflow on push or pull request events but only for the main branch
push: push:
branches: branches:
- master - main
pull_request: pull_request:
branches: branches:
- master - main
# Allows you to run this workflow manually from the Actions tab # Allows you to run this workflow manually from the Actions tab
workflow_dispatch: workflow_dispatch:

View File

@@ -3,13 +3,13 @@ name: 'Windows Build'
# Controls when the action will run. # Controls when the action will run.
on: on:
# Triggers the workflow on push or pull request events but only for the master branch # Triggers the workflow on push or pull request events but only for the main branch
push: push:
branches: branches:
- master - main
pull_request: pull_request:
branches: branches:
- master - main
# Allows you to run this workflow manually from the Actions tab # Allows you to run this workflow manually from the Actions tab
workflow_dispatch: workflow_dispatch:

View File

@@ -151,11 +151,11 @@ Please note that Hot reload is only available in Renderer process.
- Angular 10 & Electron 9 : Branch [angular10](https://github.com/maximegris/angular-electron/tree/angular10) - Angular 10 & Electron 9 : Branch [angular10](https://github.com/maximegris/angular-electron/tree/angular10)
- Angular 11 & Electron 12 : Branch [angular11](https://github.com/maximegris/angular-electron/tree/angular11) - Angular 11 & Electron 12 : Branch [angular11](https://github.com/maximegris/angular-electron/tree/angular11)
- Angular 12 & Electron 16 : Branch [angular12](https://github.com/maximegris/angular-electron/tree/angular12) - Angular 12 & Electron 16 : Branch [angular12](https://github.com/maximegris/angular-electron/tree/angular12)
- Angular 13 & Electron 17 : (master) - Angular 13 & Electron 17 : (main)
[maintained-badge]: https://img.shields.io/badge/maintained-yes-brightgreen [maintained-badge]: https://img.shields.io/badge/maintained-yes-brightgreen
[license-badge]: https://img.shields.io/badge/license-MIT-blue.svg [license-badge]: https://img.shields.io/badge/license-MIT-blue.svg
[license]: https://github.com/maximegris/angular-electron/blob/master/LICENSE.md [license]: https://github.com/maximegris/angular-electron/blob/main/LICENSE.md
[prs-badge]: https://img.shields.io/badge/PRs-welcome-red.svg [prs-badge]: https://img.shields.io/badge/PRs-welcome-red.svg
[prs]: http://makeapullrequest.com [prs]: http://makeapullrequest.com

View File

@@ -13,8 +13,12 @@
"schematics": { "schematics": {
"@schematics/angular:application": { "@schematics/angular:application": {
"strict": true "strict": true
},
"@schematics/angular:component": {
"style": "scss"
} }
}, },
"prefix": "app",
"architect": { "architect": {
"build": { "build": {
"builder": "@angular-builders/custom-webpack:browser", "builder": "@angular-builders/custom-webpack:browser",
@@ -139,7 +143,8 @@
"karmaConfig": "src/karma.conf.js", "karmaConfig": "src/karma.conf.js",
"scripts": [], "scripts": [],
"styles": [ "styles": [
"src/styles.scss" "src/favicon.ico",
"src/assets"
], ],
"assets": [ "assets": [
"src/assets" "src/assets"
@@ -176,14 +181,5 @@
} }
} }
}, },
"defaultProject": "angular-electron", "defaultProject": "angular-electron"
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"style": "scss"
},
"@schematics/angular:directive": {
"prefix": "app"
}
}
} }