Skip to content

Commit bc23275

Browse files
committed
chore: update remaining release-1.x branch references
The release-1.x branch was renamed to main. This commit cleans up the remaining references to release-1.x.
1 parent 4739cd0 commit bc23275

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,38 @@
1010
# supported CodeQL languages.
1111
# ******** NOTE ********
1212

13-
name: "CodeQL"
13+
name: 'CodeQL'
1414

1515
on:
16-
push:
17-
branches: [ master,release-1.x ]
18-
pull_request:
19-
# The branches below must be a subset of the branches above
20-
branches: [ master,release-1.x ]
21-
schedule:
22-
- cron: '35 14 * * 3'
16+
push:
17+
branches: [master, main]
18+
pull_request:
19+
# The branches below must be a subset of the branches above
20+
branches: [master, main]
21+
schedule:
22+
- cron: '35 14 * * 3'
2323

2424
jobs:
25-
analyze:
26-
name: Analyze
27-
runs-on: ubuntu-latest
25+
analyze:
26+
name: Analyze
27+
runs-on: ubuntu-latest
2828

29-
strategy:
30-
fail-fast: false
31-
matrix:
32-
language: [ 'javascript' ]
29+
strategy:
30+
fail-fast: false
31+
matrix:
32+
language: ['javascript']
3333

34-
steps:
35-
- name: Checkout repository
36-
uses: actions/checkout@v3
34+
steps:
35+
- name: Checkout repository
36+
uses: actions/checkout@v3
3737

38-
# Initializes the CodeQL tools for scanning.
39-
- name: Initialize CodeQL
40-
uses: github/codeql-action/init@v2
41-
with:
42-
languages: ${{ matrix.language }}
43-
44-
- name: Autobuild
45-
uses: github/codeql-action/autobuild@v2
46-
- name: Perform CodeQL Analysis
47-
uses: github/codeql-action/analyze@v2
38+
# Initializes the CodeQL tools for scanning.
39+
- name: Initialize CodeQL
40+
uses: github/codeql-action/init@v2
41+
with:
42+
languages: ${{ matrix.language }}
43+
44+
- name: Autobuild
45+
uses: github/codeql-action/autobuild@v2
46+
- name: Perform CodeQL Analysis
47+
uses: github/codeql-action/analyze@v2

pre-check.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
branch=$(git rev-parse --abbrev-ref HEAD)
44

5-
if [[ "${branch}" != "release-1.x" ]]; then
6-
echo "This script can only be run on the release-1.x branch. Current branch is ${branch}"
5+
if [[ "${branch}" != "main" ]]; then
6+
echo "This script can only be run on the main branch. Current branch is ${branch}"
77
exit 1
88
fi
99

0 commit comments

Comments
 (0)