From 99b62f3d32cfc67aee3c4d3d82f81463d59b6eef Mon Sep 17 00:00:00 2001 From: "F.Tibor" Date: Tue, 16 Jun 2026 11:32:17 +0200 Subject: [PATCH 1/5] Explicitely drop support for bazel 6 --- .github/bazel_version.json | 1 - MODULE.bazel | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/bazel_version.json b/.github/bazel_version.json index 98faab3e..1f08d08f 100644 --- a/.github/bazel_version.json +++ b/.github/bazel_version.json @@ -1,5 +1,4 @@ [ - "6.5.0", "7.7.1", "8.5.1" ] diff --git a/MODULE.bazel b/MODULE.bazel index fde5f260..f4eca6e2 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -14,7 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. """ -module(name = "rules_codechecker") +module( + name = "rules_codechecker", + bazel_compatibility = [">=7.0.0"], +) bazel_dep(name = "rules_python", version = "0.32.0") bazel_dep(name = "rules_cc", version = "0.2.3") From f5c7edd7978065cf842cbd8e873af70570ee953e Mon Sep 17 00:00:00 2001 From: "F.Tibor" Date: Thu, 18 Jun 2026 17:07:58 +0200 Subject: [PATCH 2/5] Remove explicit requirement for bazel 7 --- MODULE.bazel | 1 - 1 file changed, 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index f4eca6e2..a6bb3ec9 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -16,7 +16,6 @@ limitations under the License. module( name = "rules_codechecker", - bazel_compatibility = [">=7.0.0"], ) bazel_dep(name = "rules_python", version = "0.32.0") From b5d47bb6b3dcccac4e5882b123f26412a31f0460 Mon Sep 17 00:00:00 2001 From: "F.Tibor" Date: Thu, 18 Jun 2026 17:12:52 +0200 Subject: [PATCH 3/5] Remove bazel 6 from tests --- test/unit/external_repository/test_external_repo.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/test/unit/external_repository/test_external_repo.py b/test/unit/external_repository/test_external_repo.py index 12c6d764..22dbdaf1 100644 --- a/test/unit/external_repository/test_external_repo.py +++ b/test/unit/external_repository/test_external_repo.py @@ -103,14 +103,7 @@ def test_compile_commands_external_lib(self): "compile_commands.json", ) - # The ~override part is a consquence of using Bzlmod. - if self.BAZEL_VERSION.startswith("6"): # type: ignore - pattern1 = "-isystem external/external_lib~override/include" - pattern2 = ( - "-isystem bazel-out/k8-fastbuild/bin/external/" - "external_lib~override/include" - ) - elif self.BAZEL_VERSION.startswith("7"): # type: ignore + if self.BAZEL_VERSION.startswith("7"): # type: ignore pattern1 = "-isystem external/external_lib~/include" pattern2 = ( "-isystem bazel-out/k8-fastbuild/bin/external/" From 80cf6c96cce5068b473178d7c69830b985ee3077 Mon Sep 17 00:00:00 2001 From: "F.Tibor" Date: Sun, 28 Jun 2026 14:22:41 +0200 Subject: [PATCH 4/5] Remove bazel version file --- .github/bazel_version.json | 5 ----- .github/workflows/test.yaml | 25 ++++++------------------- 2 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 .github/bazel_version.json diff --git a/.github/bazel_version.json b/.github/bazel_version.json deleted file mode 100644 index 1f08d08f..00000000 --- a/.github/bazel_version.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - "7.7.1", - "8.5.1" -] - diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2e3995e7..928b8423 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -35,29 +35,15 @@ concurrency: cancel-in-progress: true jobs: - load_versions: - name: "Load bazel versions for tests" - runs-on: ubuntu-24.04 - outputs: - bazel_version: ${{ steps.generate_matrix.outputs.matrix_json }} - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Load versions - id: generate_matrix - run: | - JSON=$(jq -c . ./.github/bazel_version.json) - echo "matrix_json=$JSON" >> $GITHUB_OUTPUT - ubuntu_test: name: "Tests: Bazel ${{ matrix.bazel_version }} (Ubuntu)" runs-on: ubuntu-24.04 - needs: load_versions strategy: fail-fast: false matrix: - bazel_version: ${{ fromJson(needs.load_versions.outputs.bazel_version) }} + bazel_version: + - "7.7.1" + - "8.5.1" steps: - name: Checkout repository @@ -116,11 +102,12 @@ jobs: container: image: redhat/ubi9:latest options: --init - needs: load_versions strategy: fail-fast: false matrix: - bazel_version: ${{ fromJson(needs.load_versions.outputs.bazel_version) }} + bazel_version: + - "7.7.1" + - "8.5.1" steps: - name: Checkout repository From 6dba55f499e3d98992680bb4d22a6dc293f8699d Mon Sep 17 00:00:00 2001 From: "F.Tibor" Date: Sun, 28 Jun 2026 14:23:45 +0200 Subject: [PATCH 5/5] Remove non critical formating --- MODULE.bazel | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index a6bb3ec9..fde5f260 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -14,9 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. """ -module( - name = "rules_codechecker", -) +module(name = "rules_codechecker") bazel_dep(name = "rules_python", version = "0.32.0") bazel_dep(name = "rules_cc", version = "0.2.3")