Skip to content

Commit 8465805

Browse files
committed
Merge remote-tracking branch 'origin/master' into refactor
2 parents 52f4ae4 + 8a854c0 commit 8465805

File tree

3 files changed

+39
-45
lines changed

3 files changed

+39
-45
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ master ]
16+
branches: [master]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ master ]
19+
branches: [master]
2020
schedule:
21-
- cron: '44 16 1-7 * 6'
21+
# Runs Saturdays at 4:44 pm
22+
- cron: "44 16 1-7 * 6"
2223

2324
jobs:
2425
analyze:
@@ -32,40 +33,40 @@ jobs:
3233
strategy:
3334
fail-fast: false
3435
matrix:
35-
language: [ 'javascript' ]
36+
language: ["javascript"]
3637
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
3738
# Learn more:
3839
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
3940

4041
steps:
41-
- name: Checkout repository
42-
uses: actions/checkout@v2
42+
- name: Checkout repository
43+
uses: actions/checkout@v3
4344

44-
# Initializes the CodeQL tools for scanning.
45-
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v1
47-
with:
48-
languages: ${{ matrix.language }}
49-
# If you wish to specify custom queries, you can do so here or in a config file.
50-
# By default, queries listed here will override any specified in a config file.
51-
# Prefix the list here with "+" to use these queries and those in the config file.
52-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
45+
# Initializes the CodeQL tools for scanning.
46+
- name: Initialize CodeQL
47+
uses: github/codeql-action/init@v2
48+
with:
49+
languages: ${{ matrix.language }}
50+
# If you wish to specify custom queries, you can do so here or in a config file.
51+
# By default, queries listed here will override any specified in a config file.
52+
# Prefix the list here with "+" to use these queries and those in the config file.
53+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
5354

54-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
55-
# If this step fails, then you should remove it and run the build manually (see below)
56-
- name: Autobuild
57-
uses: github/codeql-action/autobuild@v1
55+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
56+
# If this step fails, then you should remove it and run the build manually (see below)
57+
- name: Autobuild
58+
uses: github/codeql-action/autobuild@v2
5859

59-
# ℹ️ Command-line programs to run using the OS shell.
60-
# 📚 https://git.io/JvXDl
60+
# ℹ️ Command-line programs to run using the OS shell.
61+
# 📚 https://git.io/JvXDl
6162

62-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
63-
# and modify them (or add more) to build your code if your project
64-
# uses a compiled language
63+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
64+
# and modify them (or add more) to build your code if your project
65+
# uses a compiled language
6566

66-
#- run: |
67-
# make bootstrap
68-
# make release
67+
#- run: |
68+
# make bootstrap
69+
# make release
6970

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

.github/workflows/node.js.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
1-
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
2-
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
1+
# This workflow will do a clean install of node dependencies, build the source code and lints
32

43
name: Lint
54

65
on: [pull_request]
76

87
jobs:
98
lint:
10-
119
runs-on: ubuntu-latest
1210

13-
strategy:
14-
matrix:
15-
node-version: [10.x, 12.x, 14.x, 15.x]
16-
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
17-
1811
steps:
19-
- uses: actions/checkout@v2
20-
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v1
22-
with:
23-
node-version: ${{ matrix.node-version }}
24-
- run: npm ci
25-
- run: npm run lint
12+
- uses: actions/checkout@v3
13+
- name: Use Node.js 16.x
14+
uses: actions/setup-node@v3
15+
with:
16+
node-version: "16.x"
17+
- run: npm ci --no-optional
18+
- run: npm run lint

.npmignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ src
44
.eslintrc
55
.eslintignore
66
.gitignore
7-
stuff
7+
.github

0 commit comments

Comments
 (0)