Fixup

.github/workflows/bazel-lockfile.yml

@@ -9,6 +9,7 @@ on:
   merge_group:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
+  pull_request:
   push:
     branches:
       # master is checked for up-to-date lockfile
@@ -19,7 +20,7 @@ on:
 # runs for the same workflow are cancelled on PRs but not on master
 # (logic copied from main workflow)
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 
 jobs:

BUILD.bazel

@@ -1,5 +1,5 @@
-load("@gazelle//:def.bzl", "gazelle")
 load("@bazel_skylib//rules:common_settings.bzl", "string_setting")
+load("@gazelle//:def.bzl", "gazelle")
 load("@rules_python//python:pip.bzl", "compile_pip_requirements")
 
 package(default_visibility = ["//visibility:public"])

WORKSPACE.bazel

@@ -68,7 +68,6 @@ oci_register_toolchains(name = "oci")
 
 load("@rules_oci//oci:pull.bzl", "oci_pull")
 load("//bazel:mainnet-canisters.bzl", "canisters")
-
 load("//third_party/lmdb:repository.bzl", "lmdb_repository")
 
 # We cannot derive the Bazel repository names (e.g. @mainnet_nns_registry_canister) directly

bazel/prost.bzl

@@ -6,9 +6,8 @@ load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_test")
 
 # the prost crate expects PROTOC_INCLUDE to point to a directory containing
 # various .proto files. Creating a directory is not straightforward in Bazel
-# so as a workaround we simply point to the sources. Unfortunately
-# needs to be updated whenever we bump protobuf.
-PROTOC_INCLUDE = "external/protobuf~28.2/src"
+# so as a workaround we simply point to the sources.
+PROTOC_INCLUDE = "external/protobuf~/src"
 
 def generated_files_check(name, srcs, deps, data, manifest_dir):
     rust_test(

rs/nns/governance/src/governance/tla/mod.rs

@@ -125,7 +125,7 @@ pub fn check_traces() {
 
     // Construct paths to the data files
     let apalache = PathBuf::from(&runfiles_dir).join("tla_apalache/bin/apalache-mc");
-    let tla_models_path = PathBuf::from(&runfiles_dir).join("ic/rs/nns/governance/tla");
+    let tla_models_path = PathBuf::from(&runfiles_dir).join("_main/rs/nns/governance/tla");
 
     let chunk_size = 20;
     let all_pairs = traces.into_iter().flat_map(|t| {