Skip to content

Commit

Permalink
chore: update remaining release-1.x branch references
Browse files Browse the repository at this point in the history
The release-1.x branch was renamed to main. This commit cleans up
the remaining references to release-1.x.
  • Loading branch information
cjihrig committed Dec 31, 2024
1 parent 4739cd0 commit bc23275
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
56 changes: 28 additions & 28 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,38 @@
# supported CodeQL languages.
# ******** NOTE ********

name: "CodeQL"
name: 'CodeQL'

on:
push:
branches: [ master,release-1.x ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master,release-1.x ]
schedule:
- cron: '35 14 * * 3'
push:
branches: [master, main]
pull_request:
# The branches below must be a subset of the branches above
branches: [master, main]
schedule:
- cron: '35 14 * * 3'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
analyze:
name: Analyze
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
strategy:
fail-fast: false
matrix:
language: ['javascript']

steps:
- name: Checkout repository
uses: actions/checkout@v3
steps:
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
- name: Autobuild
uses: github/codeql-action/autobuild@v2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}

- name: Autobuild
uses: github/codeql-action/autobuild@v2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
4 changes: 2 additions & 2 deletions pre-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

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

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

Expand Down

0 comments on commit bc23275

Please sign in to comment.