Skip to content

Commit 4424e89

Browse files
authored
Merge branch 'master' into depfu/update/front-end/npm/@angular/cli-12.2.18
2 parents 3e8d070 + 0d3aff5 commit 4424e89

File tree

4 files changed

+77
-13
lines changed

4 files changed

+77
-13
lines changed

.github/workflows/build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@v3
2626

2727
- name: Cache node modules
28-
uses: actions/cache@v1
28+
uses: actions/cache@v3
2929
with:
3030
path: ~/.npm
3131
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
# Initializes the CodeQL tools for scanning.
4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v1
46+
uses: github/codeql-action/init@v2
4747
with:
4848
languages: ${{ matrix.language }}
4949
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
5454
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5555
# If this step fails, then you should remove it and run the build manually (see below)
5656
- name: Autobuild
57-
uses: github/codeql-action/autobuild@v1
57+
uses: github/codeql-action/autobuild@v2
5858

5959
# ℹ️ Command-line programs to run using the OS shell.
6060
# 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
6868
# make release
6969

7070
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@v1
71+
uses: github/codeql-action/analyze@v2

front-end/package-lock.json

Lines changed: 71 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

front-end/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@angular-devkit/architect": "~0.1202.17",
4141
"@angular-devkit/build-angular": "^12.2.18",
4242
"@angular-devkit/core": "~12.2.18",
43-
"@angular-devkit/schematics": "~12.2.17",
43+
"@angular-devkit/schematics": "~12.2.18",
4444
"@angular/cli": "~12.2.18",
4545
"@angular/compiler": "^12.2.16",
4646
"@angular/compiler-cli": "^12.2.16",
@@ -57,7 +57,7 @@
5757
"cordova-plugin-ionic-webview": "^3.1.2",
5858
"cordova-plugin-splashscreen": "^5.0.2",
5959
"cordova-plugin-statusbar": "^2.4.2",
60-
"cordova-plugin-whitelist": "^1.3.3",
60+
"cordova-plugin-whitelist": "^1.3.5",
6161
"jasmine-core": "~3.8.0",
6262
"jasmine-spec-reporter": "~5.0.0",
6363
"karma": "~6.3.19",

0 commit comments

Comments
 (0)