Skip to content

Commit 1bd245e

Browse files
angelapwenangelapwen
authored
Merge branch 'main' into favor-workflow-ref
2 parents b66391a + 65b0987 commit 1bd245e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+716
-216
lines changed

‎.github/update-release-branch.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def open_pr(
6060

6161
# Start constructing the body text
6262
body = []
63-
body.append(f'Merging {source_branch_short_sha} into {target_branch}.')
63+
body.append(f'Merging {source_branch_short_sha} into `{target_branch}`.')
6464

6565
body.append('')
6666
body.append(f'Conductor for this PR is @{conductor}.')
@@ -92,7 +92,7 @@ def open_pr(
9292
'branch to resolve the merge conflicts.')
9393
body.append(' - [ ] Ensure the CHANGELOG displays the correct version and date.')
9494
body.append(' - [ ] Ensure the CHANGELOG includes all relevant, user-facing changes since the last release.')
95-
body.append(f' - [ ] Check that there are not any unexpected commits being merged into the {target_branch} branch.')
95+
body.append(f' - [ ] Check that there are not any unexpected commits being merged into the `{target_branch}` branch.')
9696
body.append(' - [ ] Ensure the docs team is aware of any documentation changes that need to be released.')
9797

9898
if not is_primary_release:

‎.github/workflows/__build-mode-rollback.yml

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

‎.github/workflows/__config-input.yml

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

‎.github/workflows/debug-artifacts-failure.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
shell: bash
6666
run: |
6767
LANGUAGES="cpp csharp go java javascript python"
68-
pushd "./my-debug-artifacts"
68+
cd "./my-debug-artifacts"
6969
echo "Artifacts from run:"
7070
for language in $LANGUAGES; do
7171
echo "- Checking $language"
@@ -82,6 +82,5 @@ jobs:
8282
exit 1
8383
fi
8484
done
85-
popd
8685
env:
8786
GO111MODULE: auto

‎.github/workflows/rebuild.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,23 @@ jobs:
2424
gh pr edit --repo github/codeql-action "$PR_NUMBER" \
2525
--remove-label "Rebuild"
2626
27+
- name: Merge in changes from base branch
28+
env:
29+
BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
30+
run: |
31+
git fetch origin "$BASE_BRANCH"
32+
33+
# Allow merge conflicts in `lib`, since rebuilding should resolve them.
34+
git merge "origin/$BASE_BRANCH" || echo "Merge conflicts detected"
35+
36+
# Check for merge conflicts outside of `lib`. Disable git diff's trailing whitespace check
37+
# since `node_modules/@types/semver/README.md` fails it.
38+
if git -c core.whitespace=-trailing-space diff --check | grep --invert-match '^lib/'; then
39+
echo "Merge conflicts detected outside of lib/ directory. Please resolve them manually."
40+
git -c core.whitespace=-trailing-space diff --check | grep --invert-match '^lib/' || true
41+
exit 1
42+
fi
43+
2744
- name: Compile TypeScript
2845
run: |
2946
npm install

‎.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
# Ignore for example failing-tests.json from AVA
2-
node_modules/.cache
2+
node_modules/.cache/
3+
# Java build files
4+
.gradle/
5+
*.class
6+
# macOS
7+
.DS_Store

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the
66

77
## [UNRELEASED]
88

9+
No user facing changes.
10+
11+
## 3.24.3 - 15 Feb 2024
12+
13+
- Fix an issue where the CodeQL Action would fail to load a configuration specified by the `config` input to the `init` Action. [#2147](https://github.com/github/codeql-action/pull/2147)
14+
15+
## 3.24.2 - 15 Feb 2024
16+
17+
- Enable improved multi-threaded performance on larger runners for GitHub Enterprise Server users. This feature is already available to GitHub.com users. [#2141](https://github.com/github/codeql-action/pull/2141)
18+
19+
## 3.24.1 - 13 Feb 2024
20+
921
- Update default CodeQL bundle version to 2.16.2. [#2124](https://github.com/github/codeql-action/pull/2124)
1022
- The CodeQL action no longer fails if it can't write to the telemetry api endpoint. [#2121](https://github.com/github/codeql-action/pull/2121)
1123
- Users of GHES3.9+ and GHEC will no longer need to include `actions: read` permissions to use `upload-sarif` in private repositories.

‎lib/analyze.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/analyze.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy