Skip to content

Commit 2e0b703

Browse files
jDramaixcopybara-github
authored andcommitted
Automate stripping of J2CL dependency overrides for release validation.
Dependency overrides in MODULE.bazel are now wrapped in marker comments and automatically stripped during release validation in CI. This ensures that release validation correctly tests against pinned versions while development and standard CI continue to use GitHub HEAD versions. PiperOrigin-RevId: 904574671
1 parent 29066af commit 2e0b703

2 files changed

Lines changed: 20 additions & 8 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ on:
3535
description: 'The git ref used to checkout the repository and run the tests.'
3636
type: string
3737
required: false
38+
is_release:
39+
type: boolean
40+
required: false
41+
default: false
3842

3943
# https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobs
4044
jobs:
@@ -92,6 +96,14 @@ jobs:
9296
if: matrix.os == 'macos-latest'
9397
run: sudo scutil --set HostName unknown
9498

99+
# Use pinned versions of our project dependencies when running test during the release
100+
# process.
101+
- name: Disable dev overrides
102+
if: inputs.is_release == true
103+
run: |
104+
echo "Removing overrides from MODULE.bazel"
105+
sed -i '/--- BEGIN DEV OVERRIDES ---/,/--- END DEV OVERRIDES ---/d' MODULE.bazel
106+
95107
- name: Run tests
96108
if: matrix.test-target == 'default'
97109
run: ./build_test.sh CI

MODULE.bazel

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
module(name = "jsinterop_base")
22

33
bazel_dep(name = "j2cl", version = "20260402")
4+
bazel_dep(name = "bazel_skylib", version = "1.9.0")
5+
bazel_dep(name = "google_bazel_common", version = "0.0.1")
6+
bazel_dep(name = "rules_java", version = "8.13.0")
7+
bazel_dep(name = "rules_license", version = "1.0.0")
8+
bazel_dep(name = "rules_jvm_external", version = "6.6")
49

5-
# Use head j2cl for testing purposes.
10+
# --- BEGIN DEV OVERRIDES ---
11+
# Use head versions of our project dependencies for testing purposes.
612
archive_override(
713
module_name = "j2cl",
814
strip_prefix = "j2cl-master",
915
urls = ["https://github.com/google/j2cl/archive/master.zip"],
1016
)
11-
12-
bazel_dep(name = "bazel_skylib", version = "1.9.0")
13-
bazel_dep(name = "google_bazel_common", version = "0.0.1")
14-
bazel_dep(name = "rules_java", version = "8.13.0")
15-
bazel_dep(name = "rules_license", version = "1.0.0")
17+
# --- END DEV OVERRIDES ---
1618

1719
# Maven dependencies.
1820

19-
bazel_dep(name = "rules_jvm_external", version = "6.6")
20-
2121
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
2222
maven.install(
2323
artifacts = [

0 commit comments

Comments
 (0)