diff options
| author | Colin Cross <ccross@android.com> | 2018-11-04 17:34:26 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-11-04 17:36:28 -0800 |
| commit | 11fb7aeddd6ff7229bcf0834017f8091f97d7edb (patch) | |
| tree | c6efd4099d63806180b2310de5c9ea81c2f1e26e /appveyor.yml | |
| parent | 584979bf55601bd23e533d704a75cd0e95af66b9 (diff) | |
| download | protobuf-11fb7aeddd6ff7229bcf0834017f8091f97d7edb.tar.gz | |
Revert "Merge changes from topic "protobuf3.5.2""
This reverts commit 584979bf55601bd23e533d704a75cd0e95af66b9, reversing
changes made to 219bbcdcd5b1dbf19758ff2e75d971b98215896d:
Remove libprotobuf-java-lite
Update stubs
Revert "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL"
Update javamicro to compile against v3.5.2
Update Android.bp to match BUILD
Rerun configure
Merge tag 'v3.5.2' into master
Revert "Remove 2 usage of isspace as they are not stl port compatible"
Revert "Use GOOGLE_CHECK Macro for validation"
Revert "Emit macros with proper parentheses."
Revert "Generate syntactically correct java for imports from classes with no packages."
Revert "Fix some unused parameter warnings"
Revert "protobuf: work around a static analyzer bug"
Revert "Suppress clang-analyzer-core.uninitialized.UndefReturn warning."
Change-Id: Ia04c0b15ebd45e8c7e02edaa6e1f10aeb11ef337
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/appveyor.yml b/appveyor.yml index 8b440b639..c84ecae2f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,25 +11,13 @@ environment: matrix: - language: cpp BUILD_DLL: ON - UNICODE: ON - language: csharp - image: Visual Studio 2017 - -# Our build scripts run tests automatically; we don't want AppVeyor -# to try to detect them itself. -test: off install: - - curl -L -o release-1.7.0.zip https://github.com/google/googlemock/archive/release-1.7.0.zip - - 7z x release-1.7.0.zip - - del /Q release-1.7.0.zip - - rename googlemock-release-1.7.0 gmock - - curl -L -o release-1.7.0.zip "https://github.com/google/googletest/archive/release-1.7.0.zip" - - 7z x release-1.7.0.zip - - del /Q release-1.7.0.zip - - rename googletest-release-1.7.0 gtest - - move gtest gmock + - ps: Start-FileDownload https://googlemock.googlecode.com/files/gmock-1.7.0.zip + - 7z x gmock-1.7.0.zip + - rename gmock-1.7.0 gmock before_build: - if %platform%==Win32 set generator=Visual Studio 12 |