Skip to content

Commit

Permalink
feat: deploy ci (#145)
Browse files Browse the repository at this point in the history
  • Loading branch information
69pmb committed Dec 27, 2022
1 parent d6cda22 commit 9215c73
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 4 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Deploy

on:
workflow_call:
workflow_dispatch:

concurrency:
group: ${{ github.ref }}
cancel-in-progress: true

jobs:
deploy:
runs-on: self-hosted
steps:
- uses: 69pmb/deploy/workflow/deploy@main
with:
url: ${{ secrets.DEPLOY_URL }}
7 changes: 6 additions & 1 deletion .github/workflows/quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Quality
on:
push:
branches:
- "main"
- "master"
- "fix/**"
- "feat/**"
- "feature/**"
Expand All @@ -18,3 +18,8 @@ jobs:
runs-on: self-hosted
steps:
- uses: 69pmb/deploy/workflow/ts-quality@main
deploy:
if: github.ref_name == 'master'
needs: quality
uses: ./.github/workflows/deploy.yml
secrets: inherit
6 changes: 3 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"tsConfig": "tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"allowedCommonJsDependencies": ["xml2js"],
"assets": ["src/assets", "src/favicon.ico"],
Expand Down Expand Up @@ -74,7 +74,7 @@
"main": "src/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"tsConfig": "tsconfig.spec.json",
"scripts": [],
"styles": [
"node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
Expand All @@ -86,7 +86,7 @@
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
"tsConfig": ["tsconfig.app.json", "tsconfig.spec.json"],
"exclude": ["**/node_modules/**", "**/e2e/**"]
}
}
Expand Down

0 comments on commit 9215c73

Please sign in to comment.