Commit Graph

319 Commits

Author SHA1 Message Date
Deanna Garcia
87ac4650a3 Update versions for publish python script 2022-06-15 17:22:55 +00:00
mkruskal-google
3380463ff8
Deleting python release kokoro setup. This has been replaced by upb's python release (#10055) 2022-06-03 14:50:53 -07:00
David L. Jones
67f46d2495
Switch normal macos build to use cmake. (#10092) 2022-06-01 18:24:53 -07:00
zhangskz
1ec6f26ce7
Remove expected cmake failure due to missing abseil sources, since ab… (#10089)
* Remove expected cmake failure due to missing abseil sources, since absl dep was rolled back

* Add back cmake.sh run using extracted sources
2022-05-31 16:45:44 -04:00
Sandy Zhang
258514019f Merge 21.x into main 2022-05-28 00:06:34 +00:00
Adam Cozzette
7f02c3b16b
Fix continuous aarch64 builds (#10067)
Some of the continuous aarch64 builds started failing yesterday because
the autotools -> CMake change caused the protoc binary to end up in an
unexpected location. This change fixes the problem by putting a symlink
in the src/ directory.
2022-05-27 11:11:05 -07:00
Adam Cozzette
f7e2e0b301
Remove Abseil dependency from CMake build (#10056)
* Revert "Added cmake abseil include guard"

This reverts commit b6ee841d7c.

* Revert "Update CMake configuration to add a dependency on Abseil (#9793)"

This reverts commit e9246cd789.
2022-05-26 12:13:41 -07:00
mkruskal-google
f2e06fe042
Migrate linux-aarch64 tests away from autotools (#10015)
Autotools support is being deprecated, so this moves some of our kokoro tests to cmake
2022-05-26 09:54:30 -07:00
David L. Jones
bbcc459aa0
[Kokoro/Bazel] Send Bazel build results to BES. (#10008)
This change adds bazel_wrapper.sh, which uses values set by Kokoro to log remotely.
2022-05-20 19:44:51 -07:00
David L. Jones
bb27447f42
[Bazel] Use pyenv to select Python 3.9.5 on our linux/bazel builds. (#10009)
We still need to use python2 when running autotools.
2022-05-20 13:04:18 -07:00
David L. Jones
171a6b1155
[Bazel/C++] Move core C++ implementation to //src/google/protobuf package. (#9988)
This is somewhat of a rough cut, since it doesn't split apart the lite and full targets, or unit tests. However, it does split sources under src/google/protobuf into a separate package, which is a fairly impactful change.
2022-05-18 13:45:22 -07:00
David L. Jones
07303d6f54
[Bazel/C++] Factor out util library (#9987)
This change creates new Bazel packages for the C++ util libraries (similar to #9980 and #9985).
2022-05-17 18:13:22 -07:00
David L. Jones
f868799366
Use cc_dist_library targets for macos release libprotobuf. (#9966) 2022-05-17 15:36:37 -07:00
David L. Jones
c2c770e7ea
[Bazel/C++] Factor out stubs, io, and testing libraries. (#9980)
This change creates packages under src/google/protobuf/{io,stubs,testing} and moves build definitions there. Future changes will handle .../util and .../compiler, and finally src/google/protobuf.
2022-05-17 13:26:46 -07:00
David L. Jones
b3199d62be
[Python] Handle user-provided --link-objects and --library-dirs. (#9968)
If the user provides a `--link-objects` (or `-O`) flag that looks like it points to libprotobuf, use that for static linking instead of using the hard-coded path `../src/.libs/libprotobuf.a`. (Also, if we see such a flag, assume they want to link it statically, even if they don't provide `--compile_static_extension`.)

Similarly, if they provide a `--library-dirs=` (or `-L`), assume that is the location to search, and don't add the hard-coded path `../src/.libs`.
2022-05-16 17:21:28 -07:00
Deanna Garcia
193da6c8a9 Merge release branch 21.x into main 2022-05-13 18:07:04 +00:00
David L. Jones
b3cbea18ea
[Bazel] Move Python rules to //python (#9952) 2022-05-12 19:48:58 -07:00
Deanna Garcia
43b1427c18 Update python doc gen versions 2022-05-12 18:12:55 +00:00
Deanna Garcia
20d9a4fed5 Update protoc version for doc publishing 2022-05-12 17:34:06 +00:00
Deanna Garcia
e9987578ac Update protoc version for doc publishing 2022-05-12 17:31:31 +00:00
David L. Jones
87c5475687
[Kokoro] Add dist check build for linux+cmake (#9939)
The cmake tests are expected to fail for now due to Abseil sources missing from the distribution artifact. The tests are structured as expected failures.
2022-05-11 13:33:29 -07:00
David L. Jones
354aba886e
Add a test for bazel-built dist archives (#9929)
This also fixes some packaging rules that are needed for the result to be buildable.
2022-05-09 16:32:59 -07:00
David L. Jones
52655b1f5e
[Bazel] Move C++ build-related logic into //build_defs (#9921)
These are all "toolchain-y" things, like copts, link_opts, and config_settings. These are very different from what is in //toolchain, though, so I chose the somewhat common name build_defs for the package. For now, I am only using this package for purely internal things. (Most public "defs"-type things should come from rules_proto/rules_cc, anyhow.)
2022-05-06 12:11:46 -07:00
Thomas Van Lenten
0a73ec7e88 Remove the support for the kokoro cocoapods integration tests. 2022-05-03 15:34:36 -04:00
Adam Cozzette
cdc11c2d2d
Remove cuda.list from apt sources (#9896)
This will fix the collect_all_artifacts.sh script, which was broken
recently when NVidia stopped publishing Cuda packages for Ubuntu 16.04.
2022-05-02 15:46:43 -07:00
Adam Cozzette
860f8ad171
Remove the JavaScript implementation (#9874)
This implementation is about to be split out into a separate Git repo.
2022-04-28 12:08:26 -07:00
Adam Cozzette
9c8c3dea30
Start reducing our reliance on autotools (#9824)
Start reducing our reliance on autotools

This commit updates a few of our CI scripts to build protoc using Bazel
instead of autotools. I also updated the setuptools and Rake build
configs to look for protoc under bazel-bin/ so that they will
preferentially use a Bazel-built protoc binary. The goal is to start
chipping away at our use of autotools in preparation for eventually
dropping autotools support.
2022-04-27 10:40:01 -07:00
Elliotte Rusty Harold
ece5ef6b9b
Fail on unit tests failure (#9862)
* make sure JDK17 tests fail as needed
* set -e to fail on error
2022-04-26 22:30:07 +00:00
Elliotte Rusty Harold
4f552e36bd
Fix typos (#9847)
@pzd
2022-04-26 11:18:51 +00:00
Elliotte Rusty Harold
f53fd52d7b
Add Kokoro config for JDK 17 (#9845)
* add config for OpenJDK11

* update paths

* add JDK17 build
2022-04-25 20:49:58 +00:00
Elliotte Rusty Harold
62e60833b8
add Kokoro config for OpenJDK11 (#9837)
* add config for OpenJDK11
2022-04-22 21:06:11 +00:00
Joshua Haberman
5b0a961188
Merge pull request #9834 from haberman/merge-to-main
Merge 3.20.x to main
2022-04-22 19:36:12 +00:00
Elliotte Rusty Harold
bfc956bc3a
Remove old kokoro configs (#9815)
* delete unused kokoro configs
2022-04-22 10:22:24 +00:00
Joshua Haberman
f80137c46d Merge branch 'main' into merge-to-main 2022-04-22 02:44:36 +00:00
Joshua Haberman
653de45a21
Disable the aarch64 build on macOS because it is broken. (#9816)
See https://github.com/protocolbuffers/protobuf/issues/9804 for details.
2022-04-20 14:32:52 -07:00
mkruskal-google
f7b9886f9d
Fix Abseil dependency in windows protoc kokoro build (#9814)
* Adding submodule update to windows protoc build which uses CMake 3.10.1
2022-04-20 13:50:13 -04:00
mkruskal-google
e9246cd789
Update CMake configuration to add a dependency on Abseil (#9793)
* Proof of concept for CMake Abseil dependency

* Hooked up Abseil linking

* Adding test binaries

* Reverting absl::string view use added for testing.  This will still be broken for automake and bazel

* Adding new cmake config to dist list

* Whitespace fixes and an attempt at fix for Windows Python Release (CMake version < 3.13)

* Hook up LTS to windows cmake

* Fix 'git cd' typo

* Adding clarifying comment for fix

* Adding abseil dependency to protobuf-lite too

* Update submodules instead of cloning abseil-cpp

* Adding explicit pointer to abseil root directory

Co-authored-by: Jason Lunn <jason.lunn@gmail.com>
Co-authored-by: Jorg Brown <jorg.brown@gmail.com>
2022-04-17 22:28:01 -04:00
noahdietz
5abf802bc2 Replace master with main in URLs & docs 2022-04-12 10:25:08 -07:00
Elliotte Rusty Harold
26d11fdba2 -Dsurefire.failIfNoSpecifiedTests=false (#9761)
@mrkruskal

(cherry picked from commit 88eb7550a6)
2022-04-07 17:05:12 -07:00
Elliotte Rusty Harold
88eb7550a6
-Dsurefire.failIfNoSpecifiedTests=false (#9761)
@mrkruskal
2022-04-07 22:10:09 +00:00
Elliotte Rusty Harold
044cb7fd45 -DfailIfNoSpecifiedTests=false (#9753)
@jtattermusch @mkruskal-google

(cherry picked from commit 55177c3574)
2022-04-07 08:37:31 -07:00
Elliotte Rusty Harold
55177c3574
-DfailIfNoSpecifiedTests=false (#9753)
@jtattermusch @mkruskal-google
2022-04-07 14:02:57 +00:00
David L. Jones
3be07ab320
[Kokoro] Emit XML test logs on macos-next. (#9709)
This enables googletest XML output on the macos-next builders, and adds logic to collect the results.

The log collection logic is slightly complex, but it should be reusable in other contexts. The idea is to capture stdout/stderr for build steps along with googletest XML reports into a temporary directory, then stage those into paths expected for artifacts.
2022-04-01 13:49:14 -07:00
David L. Jones
0dcf31d981
Enable builds for macos-next kokoro. (#9706)
This enables build logic on the "macos-next" flavor of Kokoro tests.

The current runners use Big Sur with Xcode 13.2.1. This build uses cmake to configure and drive the build through Xcode. Tests are run under ctest.
2022-03-30 13:09:49 -07:00
David L. Jones
520c601c99
Temporary Kokoro build for macos-next. (#9693)
This build will be used to troubleshoot building on a newer macOS
image. Once it is stable, this config will replace the "macos" build.
2022-03-29 14:32:10 -07:00
Jason Lunn
6b2627718b Add JRuby 9.3.4.0 to Dockerfile and use it for 9.3.x testing. 2022-03-29 19:01:05 +00:00
Joshua Haberman
dbb9619a9d
Cherry-pick to get Ruby 3.1 support in protobuf 3.20.0 (#9657)
* Allow pre-compiled binaries for ruby 3.1.0 (#9566)

* Allow pre-compiled binaries for ruby 3.1.1

* add comment

* fix build and use ruby 3.1.0

* add ruby31 to build CI for tests and release

* trying to fix ci

* install ruby 3.1.0 in ruby_build_environment.sh

* use head for rvm to install 3.1.0

* just install master version of rvm in prepare_build_macos_rc

* force install of master rvm in ruby_build_environment.sh

* Use coroutine=universal when compiling ruby31

* use ucontext

* fix filename

* fix coroutine name

* use git head for rake-compiler-dock

* use newest rake-compiler-dock version

* Updated CHANGES.txt for Ruby changes.

* Fixed Ruby 3.1 tests by marking intersect? as unimplemented. (#9645)

* Fixed Ruby 3.1 tests by marking intersect? as unimplemented.

* Updated compatibility tests.

Co-authored-by: Marco Concetto Rudilosso <marcoconcettorudilosso@gmail.com>
2022-03-21 15:26:27 -07:00
Marco Concetto Rudilosso
abdfd093af
Allow pre-compiled binaries for ruby 3.1.0 (#9566)
* Allow pre-compiled binaries for ruby 3.1.1

* add comment

* fix build and use ruby 3.1.0

* add ruby31 to build CI for tests and release

* trying to fix ci

* install ruby 3.1.0 in ruby_build_environment.sh

* use head for rvm to install 3.1.0

* just install master version of rvm in prepare_build_macos_rc

* force install of master rvm in ruby_build_environment.sh

* Use coroutine=universal when compiling ruby31

* use ucontext

* fix filename

* fix coroutine name

* use git head for rake-compiler-dock

* use newest rake-compiler-dock version
2022-03-17 09:38:36 -07:00
Jason Lunn
df0999141e Update JRuby 9.2.19.0 -> 9.2.20.1 and 9.3.0.0 to 9.3.3.0. 2022-02-25 14:11:12 +00:00
Adam Cozzette
250fafa7c4
Fix the benchmark job and delete old Python configs (#9497)
Our benchmark job starting failing when we stopped supporting Python 3.5
and 3.6, but this change fixes it by running it in our java_stretch
Docker container, which has a more recent Python version. I also deleted
all configs related to old Python versions that we no longer support.
2022-02-11 16:25:56 -08:00