Skip to content

Commit

Permalink
Merge commit '5c526057743588624fc27788082a4846fcebab03' into support-…
Browse files Browse the repository at this point in the history
…bs-3
  • Loading branch information
andy840119 committed Nov 4, 2024
2 parents 686c853 + 5c52605 commit e3dcd51
Show file tree
Hide file tree
Showing 162 changed files with 10,846 additions and 27,308 deletions.
43 changes: 22 additions & 21 deletions .github/workflows/on-push-or-pull.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: on-pull-request-or-push

on:
workflow_dispatch:
pull_request:
push:
branches:
Expand Down Expand Up @@ -28,7 +29,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.0
uses: styfle/cancel-workflow-action@0.11.0
with:
access_token: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -37,8 +38,8 @@ jobs:
runs-on: ubuntu-latest
needs: one_run
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
- uses: actions/checkout@v3
- uses: actions/cache@v3
id: cache
with:
path: ${{ env.CACHE_NODE_MODULES_PATH }}
Expand All @@ -51,12 +52,12 @@ jobs:
needs: install
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
path: ${{ env.CACHE_NODE_MODULES_PATH }}
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: ${{ env.CACHE_DIST_PATH }}
key: dist-${{ github.run_id }}
Expand All @@ -70,12 +71,12 @@ jobs:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
path: ${{ env.CACHE_NODE_MODULES_PATH }}
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: ${{ env.CACHE_DIST_PATH }}
key: dist-${{ github.run_id }}
Expand All @@ -88,8 +89,8 @@ jobs:
runs-on: ubuntu-latest
needs: install
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
path: ${{ env.CACHE_NODE_MODULES_PATH }}
key: node_modules-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -102,8 +103,8 @@ jobs:
outputs:
output_url: ${{ steps.firebase_hosting_preview.outputs.details_url }}
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
path: ${{ env.CACHE_DIST_PATH }}
key: dist-${{ github.run_id }}
Expand All @@ -128,12 +129,12 @@ jobs:
matrix:
shard: [1, 2]
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
path: ${{ env.CACHE_NODE_MODULES_PATH }}
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: ${{ env.CACHE_DIST_PATH }}
key: dist-${{ github.run_id }}
Expand All @@ -156,7 +157,7 @@ jobs:
with:
name: playwright-report-smoke-${{ matrix.shard }}_${{ strategy.job-total }}
path: apps/ngx-bootstrap-docs-e2e/playwright-report
retention-days: 30
retention-days: 14

e2e_full:
name: e2e full
Expand All @@ -168,12 +169,12 @@ jobs:
matrix:
shard: [1, 2]
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
path: ${{ env.CACHE_NODE_MODULES_PATH }}
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: ${{ env.CACHE_DIST_PATH }}
key: dist-${{ github.run_id }}
Expand All @@ -198,4 +199,4 @@ jobs:
with:
name: playwright-report-full-${{ matrix.shard }}_${{ strategy.job-total }}
path: apps/ngx-bootstrap-docs-e2e/playwright-report
retention-days: 30
retention-days: 14
31 changes: 16 additions & 15 deletions .github/workflows/on-release.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: on-release
on:
workflow_dispatch:
push:
tags:
- bs3*
Expand All @@ -17,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.0
uses: styfle/cancel-workflow-action@0.11.0
with:
access_token: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -26,8 +27,8 @@ jobs:
runs-on: ubuntu-latest
needs: one_run
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/cache@v2.1.4
- uses: actions/checkout@v3
- uses: actions/cache@v3
id: cache
with:
path: node_modules
Expand All @@ -40,12 +41,12 @@ jobs:
needs: install
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/cache@v2.1.4
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
path: node_modules
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- uses: actions/cache@v2.1.4
- uses: actions/cache@v3
with:
path: dist
key: dist-${{ github.run_id }}
Expand All @@ -58,8 +59,8 @@ jobs:
# needs: install
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2.3.4
# - uses: actions/cache@v2.1.4
# - uses: actions/checkout@v3
# - uses: actions/cache@v3
# with:
# path: node_modules
# key: node_modules-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -72,17 +73,17 @@ jobs:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v3
- uses: actions/checkout@v3
with:
ref: 'gh-pages'
path: 'gh-pages'

- uses: actions/cache@v2.1.4
- uses: actions/cache@v3
with:
path: node_modules
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- uses: actions/cache@v2.1.4
- uses: actions/cache@v3
with:
path: dist
key: dist-${{ github.run_id }}
Expand All @@ -109,12 +110,12 @@ jobs:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/cache@v2.1.4
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
path: node_modules
key: node_modules-${{ hashFiles('**/package-lock.json') }}
- uses: actions/cache@v2.1.4
- uses: actions/cache@v3
with:
path: dist
key: dist-${{ github.run_id }}
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,5 @@ scully.log
**/playwright/.cache/

migration.json

.nx/cache
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@

/dist
/coverage

/.nx/cache
40 changes: 39 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,43 @@
"singleQuote": true,
"trailingComma": "none",
"bracketSpacing": true,
"parser": "typescript"
"parser": "typescript",
"overrides": [
{
"files": "*.json",
"options": {
"parser": "json"
}
},
{
"files": "*.html",
"options": {
"parser": "html"
}
},
{
"files": ["*.components.html", "*.component.html"],
"options": {
"parser": "angular"
}
},
{
"files": "*.md",
"options": {
"parser": "markdown"
}
},
{
"files": "*.yml",
"options": {
"parser": "yaml"
}
},
{
"files": "*.scss",
"options": {
"parser": "scss"
}
}
]
}
Loading

0 comments on commit e3dcd51

Please sign in to comment.