FazBrowse GitHub Viewer | Trending | | Home

Tools: [Download Repo ZIP] [Original HTTPS Page]

Fix merge conflict handling in the rebuild workflow by henrymercer · Pull Request #4191 · github/codeql-action · GitHub

Fix merge conflict handling in the rebuild workflow by henrymercer · Pull Request #4191 · github/codeql-action · GitHub

{{ message }}

Repository navigation

Fix merge conflict handling in the rebuild workflow - #4191

Merged

henrymercer merged 2 commits into

mainfrom

henrymercer/ci-job-failure-investigation

Oct 5, 2026

Merged

Fix merge conflict handling in the rebuild workflow#4191
henrymercer merged 2 commits into
mainfrom
henrymercer/ci-job-failure-investigation

PR Checks on: push 41

Unit Tests (ubuntu-latest, 20)

Unit Tests (ubuntu-latest, 24)

Unit Tests (macos-latest, 20)

Unit Tests (macos-latest, 24)

Unit Tests (windows-latest, 20)

Unit Tests (windows-latest, 24)

Other checks

Post repo size comment

PR Check - Go: tracing with autobuilder step on: pull_request 29

Go: tracing with autobuilder step (ubuntu-latest, stable-v2.19.4)

Go: tracing with autobuilder step (ubuntu-latest, stable-v2.20.7)

Go: tracing with autobuilder step (ubuntu-latest, stable-v2.21.4)

Go: tracing with autobuilder step (ubuntu-latest, stable-v2.22.4)

Go: tracing with autobuilder step (ubuntu-latest, stable-v2.23.9)

Go: tracing with autobuilder step (ubuntu-latest, stable-v2.24.3)

Go: tracing with autobuilder step (ubuntu-latest, default)

Go: tracing with autobuilder step (ubuntu-latest, linked)

Go: tracing with autobuilder step (macos-latest, linked)

Go: tracing with autobuilder step (ubuntu-latest, nightly-latest)

Go: tracing with autobuilder step (macos-latest, nightly-latest)

PR Check - Packaging: Download using registries on: pull_request 15

Packaging: Download using registries (ubuntu-latest, default)

Packaging: Download using registries (ubuntu-latest, linked)

Packaging: Download using registries (ubuntu-latest, nightly-latest)

PR Check - Bundle: Caching checks on: pull_request 5

Bundle: Caching checks (ubuntu-latest, linked)

Bundle: Caching checks (macos-latest, linked)

Bundle: Caching checks (windows-latest, linked)

PR Check - Swift analysis using autobuild on: pull_request 2

Swift analysis using autobuild (macos-latest-xlarge, nightly-latest)

PR Check - Local CodeQL bundle on: pull_request 9

Local CodeQL bundle (ubuntu-latest, linked)

PR Checks on: pull_request 41

Unit Tests (ubuntu-latest, 20)

Unit Tests (ubuntu-latest, 24)

Unit Tests (macos-latest, 20)

Unit Tests (macos-latest, 24)

Unit Tests (windows-latest, 20)

Unit Tests (windows-latest, 24)

Other checks

Post repo size comment

Test that the workaround for python 3.12 on windows works on: pull_request 1

test-setup-python-scripts

PR Check - Build mode rollback on: pull_request 4

Build mode rollback (ubuntu-latest, nightly-latest)

PR Check - Custom source root on: pull_request 9

Custom source root (ubuntu-latest, linked)

Custom source root (ubuntu-latest, default)

Custom source root (ubuntu-latest, nightly-latest)

PR Check - Autobuild working directory on: pull_request 3

Autobuild working directory (ubuntu-latest, linked)

PR Check - Language aliases on: pull_request 3

Language aliases (ubuntu-latest, linked)

PR Check - Go: diagnostic when Go is changed after init step on: pull_request 4

Go: diagnostic when Go is changed after init step (ubuntu-latest, default)

PR Check - Build mode none on: pull_request 4

Build mode none (ubuntu-latest, linked)

Build mode none (ubuntu-latest, nightly-latest)

PR Check - Analysis kinds on: pull_request 16

Analysis kinds (ubuntu-latest, linked, code-scanning)

Analysis kinds (ubuntu-latest, linked, code-quality)

Analysis kinds (ubuntu-latest, linked, code-scanning,code-quality)

Analysis kinds (ubuntu-latest, linked, risk-assessment)

Analysis kinds (ubuntu-latest, nightly-latest, code-scanning)

Analysis kinds (ubuntu-latest, nightly-latest, code-quality)

Analysis kinds (ubuntu-latest, nightly-latest, code-scanning,code-quality)

Analysis kinds (ubuntu-latest, nightly-latest, risk-assessment)

PR Check - Packaging: Config and input passed to the CLI on: pull_request 24

Packaging: Config and input passed to the CLI (ubuntu-latest, linked)

Packaging: Config and input passed to the CLI (ubuntu-latest, default)

Packaging: Config and input passed to the CLI (ubuntu-latest, nightly-latest)

PR Check - Bundle: From toolcache on: pull_request 2

Bundle: From toolcache (ubuntu-latest, toolcache)

PR Check - Swift analysis using a custom build command on: pull_request 24

Swift analysis using a custom build command (macos-latest-xlarge, linked)

Swift analysis using a custom build command (macos-latest-xlarge, default)

Swift analysis using a custom build command (macos-latest-xlarge, nightly-latest)

PR Check - Split workflow on: pull_request 48

Split workflow (ubuntu-latest, linked)

Split workflow (macos-latest, linked)

Split workflow (ubuntu-latest, default)

Split workflow (macos-latest, default)

Split workflow (ubuntu-latest, nightly-latest)

Split workflow (macos-latest, nightly-latest)

PR Check - Debug artifact upload on: pull_request 41

Upload debug artifacts (stable-v2.20.3)

Upload debug artifacts (default)

Upload debug artifacts (linked)

Upload debug artifacts (nightly-latest)

Download and check debug artifacts

PR Check - Linux Arm64 on: pull_request 8

Linux Arm64 (ubuntu-24.04-arm, nightly-latest)

PR Check - Go: tracing with legacy workflow on: pull_request 29

Go: tracing with legacy workflow (ubuntu-latest, stable-v2.19.4)

Go: tracing with legacy workflow (ubuntu-latest, stable-v2.20.7)

Go: tracing with legacy workflow (ubuntu-latest, stable-v2.21.4)

Go: tracing with legacy workflow (ubuntu-latest, stable-v2.22.4)

Go: tracing with legacy workflow (ubuntu-latest, stable-v2.23.9)

Go: tracing with legacy workflow (ubuntu-latest, stable-v2.24.3)

Go: tracing with legacy workflow (ubuntu-latest, default)

Go: tracing with legacy workflow (ubuntu-latest, linked)

Go: tracing with legacy workflow (macos-latest, linked)

Go: tracing with legacy workflow (ubuntu-latest, nightly-latest)

Go: tracing with legacy workflow (macos-latest, nightly-latest)

PR Check - Multi-language repository on: pull_request 161

Multi-language repository (ubuntu-latest, stable-v2.19.4)

Multi-language repository (macos-15-xlarge, stable-v2.19.4)

Multi-language repository (ubuntu-latest, stable-v2.20.7)

Multi-language repository (macos-15-xlarge, stable-v2.20.7)

Multi-language repository (ubuntu-latest, stable-v2.21.4)

Multi-language repository (macos-15-xlarge, stable-v2.21.4)

Multi-language repository (ubuntu-latest, stable-v2.22.4)

Multi-language repository (macos-15-xlarge, stable-v2.22.4)

Multi-language repository (ubuntu-latest, stable-v2.23.9)

Multi-language repository (macos-latest-xlarge, stable-v2.23.9)

Multi-language repository (ubuntu-latest, stable-v2.24.3)

Multi-language repository (macos-latest-xlarge, stable-v2.24.3)

Multi-language repository (ubuntu-latest, default)

Multi-language repository (macos-latest-xlarge, default)

Multi-language repository (ubuntu-latest, linked)

Multi-language repository (macos-latest-xlarge, linked)

Multi-language repository (ubuntu-latest, nightly-latest)

Multi-language repository (macos-latest-xlarge, nightly-latest)

PR Check - Build mode autobuild on: pull_request 10

Build mode autobuild (ubuntu-latest, linked)

Build mode autobuild (windows-latest, linked)

Build mode autobuild (ubuntu-latest, nightly-latest)

Build mode autobuild (windows-latest, nightly-latest)

PR Check - Test unsetting environment variables on: pull_request 18

Test unsetting environment variables (ubuntu-latest, linked)

Test unsetting environment variables (ubuntu-latest, nightly-latest)

PR Check - Remote config file on: pull_request 16

Remote config file (ubuntu-latest, linked)

Remote config file (ubuntu-latest, nightly-latest)

PR Check - Go: diagnostic when `file` is not installed on: pull_request 3

Go: diagnostic when `file` is not installed (ubuntu-latest, default)

PR Check - Upload-sarif: 'ref' and 'sha' from inputs on: pull_request 8

Upload-sarif: 'ref' and 'sha' from inputs (ubuntu-latest, default)

PR Check - Go: workaround for indirect tracing on: pull_request 2

Go: workaround for indirect tracing (ubuntu-latest, default)

PR Check - Use a custom `checkout_path` on: pull_request 9

Use a custom `checkout_path` (ubuntu-latest, linked)

PR Check - Packaging: Action input on: pull_request 24

Packaging: Action input (ubuntu-latest, linked)

Packaging: Action input (ubuntu-latest, default)

Packaging: Action input (ubuntu-latest, nightly-latest)

PR Check - Config export on: pull_request 4

Config export (ubuntu-latest, linked)

Config export (ubuntu-latest, nightly-latest)

PR Check - Packaging: Config and input on: pull_request 24

Packaging: Config and input (ubuntu-latest, linked)

Packaging: Config and input (ubuntu-latest, default)

Packaging: Config and input (ubuntu-latest, nightly-latest)

PR Check - Resolve environment on: pull_request 6

Resolve environment (ubuntu-latest, linked)

Resolve environment (ubuntu-latest, default)

Resolve environment (ubuntu-latest, nightly-latest)

PR Check - Proxy test on: pull_request 6

Proxy test (ubuntu-latest, linked)

Proxy test (ubuntu-latest, nightly-latest)

PR Check - Bundle: From nightly on: pull_request 2

Bundle: From nightly (ubuntu-latest, linked)

PR Check - Build mode manual on: pull_request 9

Build mode manual (ubuntu-latest, nightly-latest)

PR Check - Go: Custom queries on: pull_request 16

Go: Custom queries (ubuntu-latest, linked)

Go: Custom queries (ubuntu-latest, nightly-latest)

PR Check - Overlay database init fallback on: pull_request 4

Overlay database init fallback (ubuntu-latest, linked)

Overlay database init fallback (ubuntu-latest, nightly-latest)

PR Check - Per-language bundles on: pull_request 21

Per-language bundles (actions, ubuntu-latest, nightly-latest, actions javascript)

Per-language bundles (cpp, ubuntu-latest, nightly-latest, manual, gcc -o main main.c)

Per-language bundles (csharp, ubuntu-latest, nightly-latest, none)

Per-language bundles (go, ubuntu-latest, nightly-latest, autobuild)

Per-language bundles (java, ubuntu-latest, nightly-latest, none)

Per-language bundles (javascript, ubuntu-latest, nightly-latest)

Per-language bundles (python, ubuntu-latest, nightly-latest)

Per-language bundles (ruby, ubuntu-latest, nightly-latest)

Per-language bundles (rust, ubuntu-latest, nightly-latest)

Per-language bundles (swift, macos-latest-xlarge, nightly-latest, autobuild)

Query filters tests on: pull_request 7

Query Filters Tests

PR Check - Go: tracing with custom build steps on: pull_request 29

Go: tracing with custom build steps (ubuntu-latest, stable-v2.19.4)

Go: tracing with custom build steps (ubuntu-latest, stable-v2.20.7)

Go: tracing with custom build steps (ubuntu-latest, stable-v2.21.4)

Go: tracing with custom build steps (ubuntu-latest, stable-v2.22.4)

Go: tracing with custom build steps (ubuntu-latest, stable-v2.23.9)

Go: tracing with custom build steps (ubuntu-latest, stable-v2.24.3)

Go: tracing with custom build steps (ubuntu-latest, default)

Go: tracing with custom build steps (ubuntu-latest, linked)

Go: tracing with custom build steps (macos-latest, linked)

Go: tracing with custom build steps (ubuntu-latest, nightly-latest)

Go: tracing with custom build steps (macos-latest, nightly-latest)

PR Check - Start proxy on: pull_request 5

Start proxy (ubuntu-latest, linked)

Start proxy (macos-latest, linked)

Start proxy (windows-latest, linked)

PR Check - Config input on: pull_request 2

Config input (ubuntu-latest, linked)

PR Check - Extractor ram and threads options test on: pull_request 3

Extractor ram and threads options test (ubuntu-latest, linked)

Code-Scanning config CLI tests on: pull_request 6

Code Scanning Configuration tests (ubuntu-latest, linked)

Code Scanning Configuration tests (ubuntu-latest, default)

Code Scanning Configuration tests (ubuntu-latest, nightly-latest)

PR Check - Packaging: Config file on: pull_request 24

Packaging: Config file (ubuntu-latest, linked)

Packaging: Config file (ubuntu-latest, default)

Packaging: Config file (ubuntu-latest, nightly-latest)

PR Check - Test different uses of `upload-sarif` on: pull_request 26

Test different uses of `upload-sarif` (ubuntu-latest, default, code-scanning)

Test different uses of `upload-sarif` (ubuntu-latest, default, code-quality)

Test different uses of `upload-sarif` (ubuntu-latest, default, code-scanning,code-quality)

PR Check - Debug artifacts after failure on: pull_request 41

Upload debug artifacts after failure in analyze (stable-v2.20.3)

Upload debug artifacts after failure in analyze (default)

Upload debug artifacts after failure in analyze (linked)

Upload debug artifacts after failure in analyze (nightly-latest)

Download and check debug artifacts after failure in analyze

PR Check - Autobuild direct tracing (custom working directory) on: pull_request 10

Autobuild direct tracing (custom working directory) (ubuntu-latest, linked)

Autobuild direct tracing (custom working directory) (windows-latest, linked)

Autobuild direct tracing (custom working directory) (ubuntu-latest, nightly-latest)

Autobuild direct tracing (custom working directory) (windows-latest, nightly-latest)

PR Check - Diagnostic export on: pull_request 4

Diagnostic export (ubuntu-latest, linked)

Diagnostic export (ubuntu-latest, nightly-latest)

PR Check - Analyze: 'ref' and 'sha' from inputs on: pull_request 8

Analyze: 'ref' and 'sha' from inputs (ubuntu-latest, default)

PR Check - C/C++: autoinstalling dependencies is skipped (macOS) on: pull_request 6

C/C++: autoinstalling dependencies is skipped (macOS) (macos-latest, linked)

C/C++: autoinstalling dependencies is skipped (macOS) (macos-latest, nightly-latest)

PR Check - Rust analysis on: pull_request 13

Rust analysis (ubuntu-latest, stable-v2.19.4)

Rust analysis (ubuntu-latest, stable-v2.22.1)

Rust analysis (ubuntu-latest, linked)

Rust analysis (ubuntu-latest, default)

Rust analysis (ubuntu-latest, nightly-latest)

PR Check - All-platform bundle on: pull_request 26

All-platform bundle (ubuntu-latest, nightly-latest)

All-platform bundle (macos-latest-xlarge, nightly-latest)

All-platform bundle (windows-latest, nightly-latest)

Label PR with size on: pull_request 1

Label PR with size

PR Check - autobuild-action on: pull_request 38

autobuild-action (ubuntu-latest, linked)

autobuild-action (macos-latest, linked)

autobuild-action (windows-latest, linked)

PR Check - Ruby analysis on: pull_request 12

Ruby analysis (ubuntu-latest, linked)

Ruby analysis (macos-latest, linked)

Ruby analysis (ubuntu-latest, default)

Ruby analysis (macos-latest, default)

Ruby analysis (ubuntu-latest, nightly-latest)

Ruby analysis (macos-latest, nightly-latest)

PR Check - C/C++: autoinstalling dependencies (Linux) on: pull_request 9

C/C++: autoinstalling dependencies (Linux) (ubuntu-latest, linked)

C/C++: autoinstalling dependencies (Linux) (ubuntu-latest, default)

C/C++: autoinstalling dependencies (Linux) (ubuntu-latest, nightly-latest)

PR Check - CodeQL Bundle All on: pull_request 9

CodeQL Bundle All (ubuntu-latest, nightly-latest)

CodeQL action on: pull_request 6

check-codeql-versions

analyze-other (actions)

analyze-javascript (ubuntu-22.04)

analyze-javascript (ubuntu-22.04, linked)

analyze-javascript (ubuntu-24.04)

analyze-javascript (ubuntu-24.04, linked)

analyze-javascript (windows-2022)

analyze-javascript (windows-2022, linked)

analyze-javascript (windows-2025)

analyze-javascript (windows-2025, linked)

analyze-javascript (macos-14-xlarge)

analyze-javascript (macos-14-xlarge, linked)

analyze-javascript (macos-15-xlarge)

analyze-javascript (macos-15-xlarge, linked)

PR Check - RuboCop multi-language on: pull_request 2

RuboCop multi-language (ubuntu-latest, default)

PR Check - Submit SARIF after failure on: pull_request 9

Submit SARIF after failure (ubuntu-latest, linked)

Submit SARIF after failure (ubuntu-latest, default)

Submit SARIF after failure (ubuntu-latest, nightly-latest)

PR Check - Clean up database cluster directory on: pull_request 3

Clean up database cluster directory (ubuntu-latest, linked)

PR Check - C/C++: disabling autoinstalling dependencies (Linux) on: pull_request 9

C/C++: disabling autoinstalling dependencies (Linux) (ubuntu-latest, linked)

C/C++: disabling autoinstalling dependencies (Linux) (ubuntu-latest, default)

C/C++: disabling autoinstalling dependencies (Linux) (ubuntu-latest, nightly-latest)

PR Check - Job run UUID added to SARIF on: pull_request 2

Job run UUID added to SARIF (ubuntu-latest, nightly-latest)

PR Check - Export file baseline information on: pull_request 26

Export file baseline information (ubuntu-latest, nightly-latest)

Export file baseline information (macos-latest, nightly-latest)

Export file baseline information (windows-latest, nightly-latest)

Code scanning results

CodeQL

ESLint

Label PR with size on: pull_request 1

Label PR with size

Select a check to view from the sidebar

© 2026 GitHub, Inc.

Back | FazBrowse Home | New Git URL