Skip to content

Commit 0e1a0ad

Browse files
authored
Merge branch 'm-lab:main' into feat/add-issue-templates
2 parents 220b630 + a2b15cb commit 0e1a0ad

File tree

4 files changed

+17
-1
lines changed

4 files changed

+17
-1
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

.github/workflows/firebase-hosting-merge.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@ name: Deploy to Firebase Hosting on merge
66
push:
77
branches:
88
- main
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
913
permissions:
1014
contents: read
1115
checks: write
1216
jobs:
1317
build_and_deploy:
1418
runs-on: ubuntu-latest
19+
timeout-minutes: 15
1520
steps:
1621
- uses: actions/checkout@v4
1722
- run: npm install -g yarn && yarn install --frozen-lockfile && yarn build

.github/workflows/firebase-hosting-pull-request.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@
33

44
name: Deploy to Firebase Hosting on PR
55
'on': pull_request
6+
7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
9+
cancel-in-progress: true
610
permissions:
711
contents: read
812
checks: write
913
jobs:
1014
build_and_preview:
1115
if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
1216
runs-on: ubuntu-latest
17+
timeout-minutes: 15
1318
steps:
1419
- uses: actions/checkout@v4
1520
- run: npm install -g yarn && yarn install --frozen-lockfile && yarn build

app/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
<script type="text/javascript" src="libraries/ua-device-detector.min.js"></script>
6161
<script type="text/javascript" src="libraries/ng-device-detector.min.js"></script>
6262
<script type="text/javascript" src="libraries/msak.min.js"></script>
63-
<script type="text/javascript" src="libraries/pt.min.js"></script>
6463

64+
6565
<script src="measure/measure.js"></script>
6666
<script src="services/gaugeService.js"></script>
6767
<script src="app.js"></script>

0 commit comments

Comments
 (0)