Commit 1bd245e
authored
File tree
- .github
- workflows
- lib
- node_modules
- pr-checks/checks
- src
- tests/java-repo
- .gradle
- 8.1.1
- checksums
- dependencies-accessors
- executionHistory
- fileChanges
- fileHashes
- buildOutputCleanup
- vcs-1
- bin/main
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -60,7 +60,7 @@ def open_pr( | |||
| 60 | 60 | ||
| 61 | 61 | # Start constructing the body text | |
| 62 | 62 | 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}`.') | ||
| 64 | 64 | ||
| 65 | 65 | body.append('') | |
| 66 | 66 | body.append(f'Conductor for this PR is @{conductor}.') | |
@@ -92,7 +92,7 @@ def open_pr( | |||
| 92 | 92 | 'branch to resolve the merge conflicts.') | |
| 93 | 93 | body.append(' - [ ] Ensure the CHANGELOG displays the correct version and date.') | |
| 94 | 94 | 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.') | ||
| 96 | 96 | body.append(' - [ ] Ensure the docs team is aware of any documentation changes that need to be released.') | |
| 97 | 97 | ||
| 98 | 98 | if not is_primary_release: | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -65,7 +65,7 @@ jobs: | |||
| 65 | 65 | shell: bash | |
| 66 | 66 | run: | | |
| 67 | 67 | LANGUAGES="cpp csharp go java javascript python" | |
| 68 | - pushd "./my-debug-artifacts" | ||
| 68 | + cd "./my-debug-artifacts" | ||
| 69 | 69 | echo "Artifacts from run:" | |
| 70 | 70 | for language in $LANGUAGES; do | |
| 71 | 71 | echo "- Checking $language" | |
@@ -82,6 +82,5 @@ jobs: | |||
| 82 | 82 | exit 1 | |
| 83 | 83 | fi | |
| 84 | 84 | done | |
| 85 | - popd | ||
| 86 | 85 | env: | |
| 87 | 86 | GO111MODULE: auto | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -24,6 +24,23 @@ jobs: | |||
| 24 | 24 | gh pr edit --repo github/codeql-action "$PR_NUMBER" \ | |
| 25 | 25 | --remove-label "Rebuild" | |
| 26 | 26 | ||
| 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 | + | ||
| 27 | 44 | - name: Compile TypeScript | |
| 28 | 45 | run: | | |
| 29 | 46 | npm install | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,2 +1,7 @@ | |||
| 1 | 1 | # 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 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -6,6 +6,18 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the | |||
| 6 | 6 | ||
| 7 | 7 | ## [UNRELEASED] | |
| 8 | 8 | ||
| 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 | + | ||
| 9 | 21 | - Update default CodeQL bundle version to 2.16.2. [#2124](https://github.com/github/codeql-action/pull/2124) | |
| 10 | 22 | - 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) | |
| 11 | 23 | - Users of GHES3.9+ and GHEC will no longer need to include `actions: read` permissions to use `upload-sarif` in private repositories. | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments