Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: protocolbuffers/protobuf
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.18.0
Choose a base ref
...
head repository: protocolbuffers/protobuf
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.18.1
Choose a head ref
  • 13 commits
  • 58 files changed
  • 4 contributors

Commits on Sep 22, 2021

  1. Update ruby_generator.cc to allow proto2 imports in proto3 (#9003)

    * Update ruby_generator.cc to allow proto2 imports in proto3, with updated unit tests
    
    * Update Makefile.am with new ruby_generated_code_proto2_import.proto
    
    * Fix ruby_generator unit test to use temporary test directory for imported protos
    
    * Add test for imported proto2 to ruby/tests
    
    * Fix proto_path, restore to ../src/protoc, and fix/cleanup unit test.
    
    * Rename Proto2TestMessage to TestImportedMessage for consistency, for ruby compiler tests
    zhangskz authored Sep 22, 2021
    Configuration menu
    Copy the full SHA
    740c4b0 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2021

  1. Add python-requires in setup.py (#8989)

    * Add python-requires in setup.py
    
    * Update setup.py
    aisk authored and acozzette committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    2fffff8 View commit details
    Browse the repository at this point in the history
  2. Fix dist install test by ensuring that we use Python 3 (#9011)

    * Fix dist install test by ensuring that we use Python 3
    
    Now that we have dropped Python 2 support, we need to make sure this
    install test uses Python 3.
    
    * Update Docker image to install Python 3 version of setuptools
    
    * Run pip3 instead of pip
    acozzette committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    151e632 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5e8396f View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2021

  1. Merge pull request #9023 from haberman/dyn-msg-perf-fix

    Performance fix for DynamicMessage: force GetRaw() to be inlined.
    haberman authored Sep 25, 2021
    Configuration menu
    Copy the full SHA
    bf8d7f0 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2021

  1. Update dist_install test to work around Python issue

    googletest uses a Python script in its build which is not compatible
    with Python 3. Unfortunately we can't easily upgrade googletest right
    now, so this commit works around the problem by putting a python symlink
    pointing to Python 2 in the $PATH.
    acozzette committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    0e7a35f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0333cb7 View commit details
    Browse the repository at this point in the history
  3. Fix Ruby tests on Mac

    It appears that this extra conditional in travis-test.sh is no longer
    necessary, and in fact we need to avoid using a custom version of
    OpenSSL since that is causing its own error.
    acozzette committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    55b0e11 View commit details
    Browse the repository at this point in the history
  4. Use the stable version of rvm

    I am hoping this will fix the error we are getting as described here:
    rvm/rvm#5014
    acozzette committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    5378c9a View commit details
    Browse the repository at this point in the history
  5. Merge pull request #9021 from acozzette/cherry-pick-fixes

    Cherry-pick fixes for 3.18.1
    acozzette authored Sep 30, 2021
    Configuration menu
    Copy the full SHA
    bfc4c34 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2021

  1. Avoid installing anything from Homebrew in test runs (#9043)

    Installing and upgrading Homebrew packages is taking quite a lot of time
    (around 20-30 minutes) for each run. This commit removes all Homebrew
    usage from the test runs. Homebrew may have been necessary at some point
    in the past, but now it appears that everything works without it. The
    preinstalled build tools seem to be sufficient for building protoc, and
    Ruby is something we already get from rvm.
    acozzette authored Oct 1, 2021
    Configuration menu
    Copy the full SHA
    aeb624d View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2021

  1. Configuration menu
    Copy the full SHA
    40f6669 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2021

  1. Update protobuf version to 3.18.1 (#9051)

    * Update protobuf version
    
    * Update PHP release notes in package.xml
    acozzette authored Oct 5, 2021
    Configuration menu
    Copy the full SHA
    0dab03b View commit details
    Browse the repository at this point in the history
Loading