Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

Upgrade our re2 dependency to release 2019-07-01 #1915

Merged
merged 1 commit into from
Jul 11, 2019

Conversation

oschaaf
Copy link
Member

@oschaaf oschaaf commented Jul 11, 2019

Backporting this to the bazel branch will help adding re2 as a native dependency.
The version we currently depend on no longer builds with recent bazel versions.

re2 commit: 848dfb7e1d7ba641d598cb66f81590f3999a555a

Signed-off-by: Otto van der Schaaf oschaaf@we-amp.com

re2 commit: 848dfb7e1d7ba641d598cb66f81590f3999a555a
Backporting this to the bazel branch will help adding
re2 as a native dependency, because the version we currently
depend on no longer builds with recent bazel versions.

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf oschaaf added this to the Bazel build system milestone Jul 11, 2019
@oschaaf oschaaf requested a review from ashishk-1 July 11, 2019 07:57
@oschaaf oschaaf self-assigned this Jul 11, 2019
@oschaaf oschaaf mentioned this pull request Jul 11, 2019
Copy link
Contributor

@ashishk-1 ashishk-1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me

@oschaaf oschaaf merged commit 8a3ac4b into apache:master Jul 11, 2019
@oschaaf oschaaf deleted the upgrade-re2 branch July 11, 2019 13:31
oschaaf added a commit to oschaaf/incubator-pagespeed-mod that referenced this pull request Jul 11, 2019
re2 commit: 848dfb7e1d7ba641d598cb66f81590f3999a555a
Backporting this to the bazel branch will help adding
re2 as a native dependency, because the version we currently
depend on no longer builds with recent bazel versions.

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
oschaaf added a commit that referenced this pull request Jul 12, 2019
re2 commit: 848dfb7e1d7ba641d598cb66f81590f3999a555a
Backporting this to the bazel branch will help adding
re2 as a native dependency, because the version we currently
depend on no longer builds with recent bazel versions.

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
oschaaf added a commit that referenced this pull request Jul 23, 2019
* data-srcset in img and amp-img (#1899)

To rewrite amp-img srcset the parameter pagespeed UrlValuedAttribute amp-img  src image; is is needed. In fact, i think that any UrlValuedAttribute element attribute image that have src,srcset or data-srcset get rewrited.

Solves #1608 in nginx and #1849.

* Upgrade our re2 dependency to release 2019-07-01 (#1915)

re2 commit: 848dfb7e1d7ba641d598cb66f81590f3999a555a
Backporting this to the bazel branch will help adding
re2 as a native dependency, because the version we currently
depend on no longer builds with recent bazel versions.

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Bazel/libwebp: build with bazel

First stab

- Needs buildifier reformatting
- Needs revisiting for the static library build

* reference tag

* Drop sha256 verification for now

* Update CI configuration (#1923)

* CI: Remove deprecated `sudo` option in .travis.yml

Ref:
https://blog.travis-ci.com/2018-10-04-combining-linux-infrastructures

Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>

* CI: Replace manual git install with official apt addon

Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>

* CI: enable ccache to speed up build process

Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>

* Unify git to use https for submodules on git.apache.org

Only https://git.apache.org/serf.git uses https seems not cool

Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>

* CI: reduce git clone depth to speed up

Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>

* CI: Cache git submodule to speed up

Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>

* save state

* dump state

* save state

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Fix sparsehash, test symbol table

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* save state

* working symbol table test state dump

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* save state

* save state

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Re-implement chrome:base string variadic fmt

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* save state

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* pull in nspr, fix date parsing

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* dump state

pretty large dump. needs cleanup, but tests work

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* save state before switching context

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* get proto_matcher_test to work

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* state dump

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Fix html test / html_name_gperf

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Update protobuf from 3.0.0  to 3.9.0

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* dump state

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Work on pagespeed/...

Contains a hacked recent v77.x chromium /base & /url
which builds with bazel and works with GoogleUrl

Tests passing in pagespeed/...:
  - base/
  - cache/
  - html/
  - http/
  - thread
  - util

Notes:
  - pagespeed/kernel/sharedmem: fails I think on Envoy-specific testing stuff
  - pagespeed/util HMAC test disabled, crashes, not sure why.

  Some static initialization was introduced in gurl/pagespeed, which needs fixing.
  (chromiums lazyinit wasn't ported, because it pulls in lots of code)

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Fix pagespeed/js. Add omitted files.

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* save state on pagespeed/kernel/image

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* dump state on pagespeed/image

needs the .cc files to fix linkage

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* save state

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Fix linker error. Fix libjpeg turbo (non-asm)
Test failing

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Fix pagespeed/kernel/image tests

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Fix proto sha

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Fix protobuf.bzl for downgrade on bazel branch

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Attempt to fix travis: install ninja-build, cmake

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Attempt 2

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* travis: clang

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* travis: install gperf

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* travis: force c++11 in .bazelrc

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* fix net/instaweb/htmlparse

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* get tests passing on `net/instaweb/http`

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* pagespeed/controller test + grpc upgrade

some controller tests fail, but this builds and runs the tests correctly
let's dump state on that

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* controller test: fixes + disable & punt one test

defer one test to looking in to later.
suspicion is that the test has expectations on grpc
behaviour that has actually been fixed or changed on purpose.

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* apr/aprutil bazelification

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* aprutil add our own memcache2 c/h

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* First test in system/ working: AprMemCacheTest

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Update .vscode to set env -> memcachedport=11211.
+one more simple tests

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Travis-specific tweaks

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* travis: allow old style cast

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Travis: Add --jobs=3

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Travis: don't build the deps separately

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Travis: dist bionic

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* dump state on instaweb/rewriter

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* Build net/instaweb/rewriter:rewriter. Css parser fight

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* dump state on testbase rewriter

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* dump state

* rip out atexitmanager

* data2c flow (no minification yet) & spriter

linker error left which needs split deps
to avoid a cyclic dependency

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* links correctly

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>

* tests running for net/instaweb/rewriter

- those that rely on cssparser DCHECK. I probably messed it up.
- HMAC sefaults

Note: net/instaweb/config was moved to net/instaweb/rewriter/config.
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
oschaaf added a commit that referenced this pull request Sep 30, 2019
re2 commit: 848dfb7e1d7ba641d598cb66f81590f3999a555a
Backporting this to the bazel branch will help adding
re2 as a native dependency, because the version we currently
depend on no longer builds with recent bazel versions.

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
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