Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes estimated Pending Rewards value decreased unexpectedly - follow up to #16678 - 1.28.x #9473

Merged
merged 1 commit into from Jul 21, 2021

Conversation

tmancey
Copy link
Collaborator

@tmancey tmancey commented Jul 16, 2021

Uplift of #9418
Uplift of #9477
Resolves brave/brave-browser#16861

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@tmancey tmancey added this to the 1.28.x - Beta milestone Jul 16, 2021
@tmancey tmancey requested a review from a team July 16, 2021 19:05
@tmancey tmancey requested review from a team as code owners July 16, 2021 19:05
@tmancey tmancey self-assigned this Jul 16, 2021
@tmancey tmancey requested review from bsclifton and emerick and removed request for a team July 16, 2021 19:05
@tmancey tmancey force-pushed the issues/16861-1.28.x branch 2 times, most recently from ce75d97 to 62c0985 Compare July 19, 2021 14:53
… up to #16678

Fixes Brave ads JSON not saved after parsing payments balance until an ad is viewed
@kjozwiak
Copy link
Member

post-init failed due to several pylint as per https://ci.brave.com/job/pr-brave-browser-issues-16861-1.28.x-post-init/4/pylint/. However, we usually don't block uplifts due to pylint errors/warnings.

Restarting Android due to dist failing as per https://ci.brave.com/job/pr-brave-browser-issues-16861-1.28.x-android/4/execution/node/161/log/.

 Do you agree to our data usage policy? (y/n) -->Traceback (most recent call last):
17:04:32    File "/home/ubuntu/workspace/pr-brave-browser-issues-16861-1.28.x-android/src/brave/vendor/depot_tools/.cipd_bin/goma_auth.py", line 573, in <module>
17:04:32      sys.exit(main())
17:04:32    File "/home/ubuntu/workspace/pr-brave-browser-issues-16861-1.28.x-android/src/brave/vendor/depot_tools/.cipd_bin/goma_auth.py", line 569, in main
17:04:32      return action()
17:04:32    File "/home/ubuntu/workspace/pr-brave-browser-issues-16861-1.28.x-android/src/brave/vendor/depot_tools/.cipd_bin/goma_auth.py", line 411, in Login
17:04:32      ConfirmUserAgreedToS()
17:04:32    File "/home/ubuntu/workspace/pr-brave-browser-issues-16861-1.28.x-android/src/brave/vendor/depot_tools/.cipd_bin/goma_auth.py", line 95, in ConfirmUserAgreedToS
17:04:32      yn = INPUT('Do you agree to our data usage policy? (y/n) -->')
17:04:32 
 EOFError: EOF when reading a line

@kjozwiak
Copy link
Member

Restarting macOS due to build failing as per https://ci.brave.com/job/pr-brave-browser-issues-16861-1.28.x-macos/5/execution/node/147/log/

 FAILED: obj/brave/browser/notifications/notifications/ads_notification_handler.o 
21:35:53  /Users/jenkins/jenkins/workspace/pr-brave-browser-issues-16861-1.28.x-macos/src/brave/script/redirect-cc.py ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/brave/browser/notifications/notifications/ads_notification_handler.o.d -DDCHECK_ALWAYS_ON=1 -DOFFICIAL_BUILD -D_LIBCPP_HAS_NO_ALIGNED_ALLOCATION -DCR_XCODE_VERSION=1250 -DCR_CLANG_REVISION=\"llvmorg-13-init-10392-gd3676d4b-2\" -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -D_LIBCPP_ABI_UNSTABLE -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_ENABLE_NODISCARD -D_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS -D_LIBCPP_DEBUG=0 -DCR_LIBCXX_REVISION=8fa87946779682841e21e2da977eccfb6cb3bded -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DWEBP_EXTERN=extern -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DHAVE_PTHREAD -DSK_UNTIL_CRBUG_1187654_IS_FIXED -DSK_CODEC_DECODES_PNG -DSK_CODEC_DECODES_WEBP -DSK_ENCODE_PNG -DSK_ENCODE_WEBP -DSK_USER_CONFIG_HEADER=\"../../skia/config/SkUserConfig.h\" -DSK_GL -DSK_CODEC_DECODES_JPEG -DSK_ENCODE_JPEG -DSK_HAS_WUFFS_LIBRARY -DSK_SUPPORT_GPU=1 -DSK_GPU_WORKAROUNDS_HEADER=\"gpu/config/gpu_driver_bug_workaround_autogen.h\" -DSK_BUILD_FOR_MAC -DSK_METAL -I../../brave/chromium_src -I../.. -Igen -I../../third_party/perfetto/include -Igen/third_party/perfetto/build_config -Igen/third_party/perfetto -I../../third_party/libwebp/src -I../../third_party/protobuf/src -Igen/protoc_out -I../../third_party/protobuf/src -I../../third_party/abseil-cpp -I../../third_party/boringssl/src/include -I../../third_party/skia -I../../third_party/wuffs/src/release/c -fno-delete-null-pointer-checks -fno-ident -fno-strict-aliasing -fstack-protector -fcolor-diagnostics -fmerge-all-constants -fcrash-diagnostics-dir=../../tools/clang/crashreports -mllvm -instcombine-lower-dbg-declare=0 -fcomplete-member-pointers -arch x86_64 -no-canonical-prefixes -Wall -Werror -Wextra -Wimplicit-fallthrough -Wthread-safety -Wextra-semi -Wunguarded-availability -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-unneeded-internal-declaration -Wno-undefined-var-template -Wno-psabi -Wno-ignored-pragma-optimize -Wno-implicit-int-float-conversion -Wno-final-dtor-non-final-class -Wno-builtin-assume-aligned-alignment -Wno-deprecated-copy -Wno-non-c-typedef-for-linkage -Wno-max-tokens -O2 -fno-omit-frame-pointer -fno-standalone-debug -g2 -isysroot ../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk -mmacosx-version-min=10.11.0 -ftrivial-auto-var-init=pattern -fvisibility=hidden -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang checked-ptr-as-trivial-member -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -DPROTOBUF_ALLOW_DEPRECATED=1 -Wno-shorten-64-to-32 -std=c++14 -fno-trigraphs -Wno-trigraphs -stdlib=libc++ -fno-exceptions -fno-rtti -nostdinc++ -isystem../../buildtools/third_party/libc++/trunk/include -isystem../../buildtools/third_party/libc++abi/trunk/include -fvisibility-inlines-hidden -c ../../brave/browser/notifications/ads_notification_handler.cc -o obj/brave/browser/notifications/notifications/ads_notification_handler.o
21:35:53  In file included from ../../brave/browser/notifications/ads_notification_handler.cc:10:
21:35:53  In file included from ../../brave/browser/brave_ads/ads_service_factory.h:10:
21:35:53  ../../brave/components/brave_ads/browser/ads_service.h:16:10: fatal error: 'brave/vendor/bat-native-ads/include/bat/ads/public/interfaces/ads.mojom.h' file not found
21:35:53  #include "brave/vendor/bat-native-ads/include/bat/ads/public/interfaces/ads.mojom.h"
21:35:53           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
21:35:53  1 error generated.

Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 1.28.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #9418 (comment).

@kjozwiak kjozwiak merged commit 52abab2 into 1.28.x Jul 21, 2021
@kjozwiak kjozwiak deleted the issues/16861-1.28.x branch July 21, 2021 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants