Skip to content

Commit 723bd4c

Browse files
mkruskal-googlecopybara-github
mkruskal-google
authored and
copybara-github
committed
Modify release artifacts for protoc to statically link system libraries.
Closes #12063 PiperOrigin-RevId: 513034570
1 parent ab6c42b commit 723bd4c

File tree

12 files changed

+40
-37
lines changed

12 files changed

+40
-37
lines changed

‎.bazelrc‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@ build:msan --copt=-fsanitize-memory-use-after-dtor
1717
build:msan --action_env=MSAN_OPTIONS=poison_in_dtor=1
1818
build:msan --copt=-DMEMORY_SANITIZER=1
1919

20-
# Use our instrumented LLVM libc++ in Kokoro.
21-
build:kokoro-msan --config=msan
22-
build:kokoro-msan --linkopt=-L/opt/libcxx_msan/lib
23-
build:kokoro-msan --linkopt=-Wl,-rpath,/opt/libcxx_msan/lib
24-
build:kokoro-msan --cxxopt=-stdlib=libc++ --linkopt=-stdlib=libc++
25-
26-
2720
build:tsan --config=san-common --copt=-fsanitize=thread --linkopt=-fsanitize=thread
2821
build:tsan --copt=-DTHREAD_SANITIZER=1
2922

‎.github/workflows/test_cpp.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@ jobs:
1717
- { name: Optimized, flags: --config=opt }
1818
- { name: Debug, flags: --config=dbg }
1919
- { name: ASAN, flags: --config=asan }
20-
- { name: MSAN, flags: --config=kokoro-msan }
20+
- { name: MSAN, flags: --config=docker-msan }
2121
- { name: TSAN, flags: --config=tsan }
2222
- { name: UBSAN, flags: --config=ubsan }
2323
- { name: No-RTTI, flags: --cxxopt=-fno-rtti }
2424
include:
2525
# Set defaults
26-
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize@sha256:dbd2f15fb69734d72c3fd10cb819bbe2ce4890acf49e9a2f9403983fe48e8807
26+
- image: us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize@sha256:309dae3122031447d714414814d262e5f31cb93c0e248e9c02f9d8cdafd7e3b9
2727
- targets: //pkg/... //src/... @com_google_protobuf_examples//...
2828

2929
# Override cases with custom images
3030
- config: { name: "TCMalloc" }
31-
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/tcmalloc@sha256:9d975616c3fd44d5a091aeb60ee94f37e22fb367d471d258fc18cb4a2387c943"
31+
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/tcmalloc@sha256:4df3b4749e787ba0a671ec0b783d0f1ba05f60be4c9e9fd72c875550a0cde1ea"
3232
targets: "//src/..."
3333
- config: { name: "aarch64" }
3434
targets: "//src/... //src/google/protobuf/compiler:protoc_aarch64_test"
35-
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-e863f8ec6b1dfe41f7dc573bac9c8072a0a68b1b"
35+
image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-508417e5215994ade7585d28ba3aad681a25fa5d"
3636
- config: { name: "Bazel4" }
3737
targets: "//src/..."
38-
image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:4.2.3-3b71de326b62f67bf754c4dc4016d6a2fa9dd664"
38+
image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:4.2.3-6361b3a6e5c97e9951d03a4de28542fc45f1adab"
3939
name: Linux ${{ matrix.config.name }}
4040
runs-on: ubuntu-latest
4141
steps:

‎.github/workflows/test_csharp.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Run tests
2121
uses: protocolbuffers/protobuf-ci/bazel-docker@v1
2222
with:
23-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/csharp:3.1.415-6.0.100-65526ea124d1034eac33e7c37cc6d65c5bef054f
23+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/csharp:3.1.415-6.0.100-508417e5215994ade7585d28ba3aad681a25fa5d
2424
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
2525
bazel-cache: csharp_linux
2626
bazel: test //csharp/... --action_env=DOTNET_CLI_TELEMETRY_OPTOUT=1 --test_env=DOTNET_CLI_HOME=/home/bazel

‎.github/workflows/test_java.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
include:
1717
- name: OpenJDK 11
1818
version: '11'
19-
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-aec4d74f2eb6938fc53ef7d9a79a4bf2da24abc1
19+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-6361b3a6e5c97e9951d03a4de28542fc45f1adab
2020
targets: //java/... //java/internal:java_version
2121
- name: OpenJDK 17
2222
version: '17'
23-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:17-65526ea124d1034eac33e7c37cc6d65c5bef054f
23+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:17-508417e5215994ade7585d28ba3aad681a25fa5d
2424
targets: //java/... //java/internal:java_version
2525
- name: aarch64
2626
version: 'aarch64'
27-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-e863f8ec6b1dfe41f7dc573bac9c8072a0a68b1b
27+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-508417e5215994ade7585d28ba3aad681a25fa5d
2828
targets: //java/... //src/google/protobuf/compiler:protoc_aarch64_test
2929

3030
name: Linux ${{ matrix.name }}

‎.github/workflows/test_php.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Run tests
4646
uses: protocolbuffers/protobuf-ci/docker@v1
4747
with:
48-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/php:${{ matrix.version }}-6e95c0e221e4bd52e3b4dc1398c6336985196931
48+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/php:${{ matrix.version }}-508417e5215994ade7585d28ba3aad681a25fa5d
4949
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
5050
command: ${{ matrix.command }}
5151

@@ -80,6 +80,7 @@ jobs:
8080
id: cross-compile
8181
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v1
8282
with:
83+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-6361b3a6e5c97e9951d03a4de28542fc45f1adab
8384
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
8485
architecture: linux-i386
8586

@@ -111,6 +112,7 @@ jobs:
111112
id: cross-compile
112113
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v1
113114
with:
115+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-6361b3a6e5c97e9951d03a4de28542fc45f1adab
114116
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
115117
architecture: linux-aarch64
116118

‎.github/workflows/test_python.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
targets: //python/... //python:aarch64_test
2828
# TODO(b/262628111) Enable this once conformance tests are fixed.
2929
flags: --define=use_fast_cpp_protos=true --test_tag_filters=-conformance
30-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-e863f8ec6b1dfe41f7dc573bac9c8072a0a68b1b
30+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-508417e5215994ade7585d28ba3aad681a25fa5d
3131

3232
name: Linux ${{ matrix.type }} ${{ matrix.version }}
3333
runs-on: ubuntu-latest
@@ -39,7 +39,7 @@ jobs:
3939
- name: Run tests
4040
uses: protocolbuffers/protobuf-ci/bazel-docker@v1
4141
with:
42-
image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/python:{0}-65526ea124d1034eac33e7c37cc6d65c5bef054f', matrix.version) }}
42+
image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/python:{0}-508417e5215994ade7585d28ba3aad681a25fa5d', matrix.version) }}
4343
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
4444
bazel-cache: python_linux/${{ matrix.type }}_${{ matrix.version }}
4545
bazel: test ${{ matrix.targets }} ${{ matrix.flags }} --test_env=KOKORO_PYTHON_VERSION

‎.github/workflows/test_ruby.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Run tests
3535
uses: protocolbuffers/protobuf-ci/bazel-docker@v1
3636
with:
37-
image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:{0}-{1}-75e79f791b96e056086f43ace729cf3ebf9a9f5d', matrix.ruby, matrix.bazel) }}
37+
image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:{0}-{1}-508417e5215994ade7585d28ba3aad681a25fa5d', matrix.ruby, matrix.bazel) }}
3838
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
3939
bazel-cache: ruby_linux/${{ matrix.ruby }}_${{ matrix.bazel }}
4040
bazel: test //ruby/... //ruby/tests:ruby_version --test_env=KOKORO_RUBY_VERSION
@@ -52,6 +52,7 @@ jobs:
5252
id: cross-compile
5353
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v1
5454
with:
55+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-6361b3a6e5c97e9951d03a4de28542fc45f1adab
5556
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
5657
architecture: linux-aarch64
5758

@@ -124,7 +125,7 @@ jobs:
124125
- name: Run tests
125126
uses: protocolbuffers/protobuf-ci/bazel-docker@v1
126127
with:
127-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:${{ matrix.ruby }}-${{ matrix.bazel }}-75e79f791b96e056086f43ace729cf3ebf9a9f5d
128+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:${{ matrix.ruby }}-${{ matrix.bazel }}-508417e5215994ade7585d28ba3aad681a25fa5d
128129
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
129130
bazel-cache: ruby_install/${{ matrix.ruby }}_${{ matrix.bazel }}
130131
bash: >

‎BUILD.bazel‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_proto_library")
44
load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
55
load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_library")
66
load("@rules_java//java:defs.bzl", "java_lite_proto_library", "java_proto_library")
7-
load("//build_defs:cpp_opts.bzl", "COPTS", "LINK_OPTS", "PROTOC_LINK_OPTS")
7+
load("//build_defs:cpp_opts.bzl", "COPTS", "LINK_OPTS")
88
load(":protobuf.bzl", "internal_objc_proto_library", "internal_php_proto_library", "internal_py_proto_library", "internal_ruby_proto_library")
99

1010
licenses(["notice"])
@@ -168,7 +168,21 @@ alias(
168168
cc_binary(
169169
name = "protoc",
170170
copts = COPTS,
171-
linkopts = LINK_OPTS + PROTOC_LINK_OPTS,
171+
linkopts = LINK_OPTS,
172+
visibility = ["//visibility:public"],
173+
deps = ["//src/google/protobuf/compiler:protoc_lib"],
174+
)
175+
176+
cc_binary(
177+
name = "protoc_static",
178+
copts = COPTS,
179+
linkopts = LINK_OPTS,
180+
features = select({
181+
# This isn't possible on mac because there is no static library for lcrt0.o
182+
"@platforms//os:osx": [],
183+
# When cross-compiling we need to statically link all C++ libraries.
184+
"//conditions:default": ["fully_static_link"],
185+
}),
172186
visibility = ["//visibility:public"],
173187
deps = ["//src/google/protobuf/compiler:protoc_lib"],
174188
)

‎build_defs/cpp_opts.bzl‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,3 @@ LINK_OPTS = select({
4141
"-lm",
4242
],
4343
})
44-
45-
# When cross-compiling for Windows we need to statically link pthread and the C++ library.
46-
PROTOC_LINK_OPTS = select({
47-
"//build_defs:config_win32": ["-static"],
48-
"//build_defs:config_win64": ["-static"],
49-
"//conditions:default": [],
50-
})

‎ci/common.bazelrc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ build:msan --action_env=MSAN_OPTIONS=poison_in_dtor=1
1919
build:msan --copt=-DMEMORY_SANITIZER=1
2020

2121
# Use our instrumented LLVM libc++ in Kokoro.
22-
build:kokoro-msan --config=msan
23-
build:kokoro-msan --linkopt=-L/opt/libcxx_msan/lib
24-
build:kokoro-msan --linkopt=-Wl,-rpath,/opt/libcxx_msan/lib
25-
build:kokoro-msan --cxxopt=-stdlib=libc++ --linkopt=-stdlib=libc++
22+
build:docker-msan --config=msan
23+
build:docker-msan --linkopt=-L/opt/libcxx_msan/lib --linkopt=-lc++abi
24+
build:docker-msan --linkopt=-Wl,-rpath,/opt/libcxx_msan/lib
25+
build:docker-msan --cxxopt=-stdlib=libc++ --linkopt=-stdlib=libc++
2626

2727

2828
build:tsan --config=san-common --copt=-fsanitize=thread --linkopt=-fsanitize=thread

0 commit comments

Comments
 (0)