Skip to content
This repository was archived by the owner on Dec 9, 2025. It is now read-only.

Support non-zero minutes in the timestamp offset for JSON.#367

Merged
haberman merged 1 commit intoprotocolbuffers:masterfrom
haberman:timestamp-minute-offset
Feb 3, 2021
Merged

Support non-zero minutes in the timestamp offset for JSON.#367
haberman merged 1 commit intoprotocolbuffers:masterfrom
haberman:timestamp-minute-offset

Conversation

@haberman
Copy link
Member

@haberman haberman commented Feb 2, 2021

This is to address protocolbuffers/protobuf#8071

@haberman
Copy link
Member Author

haberman commented Feb 2, 2021

I'm not sure where this compile failure came from, but it has nothing to do with this PR:

ERROR: /Volumes/BuildData/tmpfs/tmp/bazel/external/com_google_absl/absl/base/BUILD.bazel:192:11: Compiling absl/base/internal/thread_identity.cc failed: (Exit 1): wrapped_clang failed: error executing command external/local_config_cc/wrapped_clang '-D_FORTIFY_SOURCE=1' -fstack-protector -fcolor-diagnostics -Wall -Wthread-safety -Wself-assign -fno-omit-frame-pointer -g0 -O2 '-D_FORTIFY_SOURCE=1' -DNDEBUG ... (remaining 41 argument(s) skipped)

Use --sandbox_debug to see verbose messages from the sandbox wrapped_clang failed: error executing command external/local_config_cc/wrapped_clang '-D_FORTIFY_SOURCE=1' -fstack-protector -fcolor-diagnostics -Wall -Wthread-safety -Wself-assign -fno-omit-frame-pointer -g0 -O2 '-D_FORTIFY_SOURCE=1' -DNDEBUG ... (remaining 41 argument(s) skipped)

Use --sandbox_debug to see verbose messages from the sandbox
clang: error: unknown argument: '-fdebug-compilation-dir'
clang: warning: .: 'linker' input unused [-Wunused-command-line-argument]

@haberman haberman force-pushed the timestamp-minute-offset branch from 3cae10c to f7ed1f2 Compare February 3, 2021 22:39
@haberman haberman merged commit b080659 into protocolbuffers:master Feb 3, 2021
haberman added a commit to haberman/protobuf that referenced this pull request Feb 3, 2021
haberman added a commit to protocolbuffers/protobuf that referenced this pull request Feb 4, 2021
* Updated upb to allow nonzero offset minutes in JSON timestamps.

This is to pick up protocolbuffers/upb#367

* Reverted error message change.

* Fixed quote chars.
@haberman haberman deleted the timestamp-minute-offset branch April 3, 2021 21:01
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants