Skip to content

fix: ensure module toolchains are dev dependencies #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix: ensure module toolchains are dev dependencies #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/release_prep.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ PREFIX="toolchains_protoc-${TAG:1}"
ARCHIVE="toolchains_protoc-$TAG.tar.gz"

# NB: configuration for 'git archive' is in /.gitattributes
git archive --format=tar --prefix=${PREFIX}/ ${TAG} | gzip > $ARCHIVE
git archive --format=tar --prefix=${PREFIX}/ ${TAG} | gzip >$ARCHIVE
SHA=$(shasum -a 256 $ARCHIVE | awk '{print $1}')

cat << EOF
cat <<EOF
## Using Bzlmod with Bazel 6

1. Enable with \`common --enable_bzlmod\` in \`.bazelrc\`.
Expand All @@ -25,6 +25,11 @@ cat << EOF
bazel_dep(name = "toolchains_protoc", version = "${TAG:1}")
\`\`\`

protoc.toolchain(
version = "v26.1",
)
use_repo(protoc, "toolchains_protoc_hub")

## Using WORKSPACE

Paste this snippet into your \`WORKSPACE.bazel\` file:
Expand All @@ -40,4 +45,4 @@ http_archive(
EOF

awk 'f;/--SNIP--/{f=1}' e2e/smoke/WORKSPACE.bazel
echo "\`\`\`"
echo "\`\`\`"
11 changes: 9 additions & 2 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,21 @@ bazel_dep(name = "bazel_skylib", version = "1.4.1")
bazel_dep(name = "rules_proto", version = "6.0.0")
bazel_dep(name = "platforms", version = "0.0.8")

protoc = use_extension("//protoc:extensions.bzl", "protoc")
protoc = use_extension(
"//protoc:extensions.bzl",
"protoc",
dev_dependency = True,
)
protoc.toolchain(
google_protobuf = "com_google_protobuf",
version = "v25.3",
)
use_repo(protoc, "com_google_protobuf", "toolchains_protoc_hub")

register_toolchains("@toolchains_protoc_hub//:all")
register_toolchains(
"@toolchains_protoc_hub//:all",
dev_dependency = True,
)

bazel_dep(name = "aspect_bazel_lib", version = "1.32.1", dev_dependency = True)
bazel_dep(name = "buildifier_prebuilt", version = "6.1.2", dev_dependency = True)
Expand Down