Skip to content
Snippets Groups Projects

Resolve Bug 40418: Update components for switch to mozilla96-based Fenix

Closed aguestuser requested to merge aguestuser/tor-browser-build:mozilla96 into master

superseded by !406 (merged)

context

  • this needs a LOT of git cleanup. opening this as draft, and will open another MR to supersede it with squashed fixups, elimination of not-for-merge commits, and some attempt to sort 37659eaf into the appropriate "part" commits
Edited by aguestuser

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • aguestuser requested review from @sysrqb

    requested review from @sysrqb

  • assigned review to @sysrqb . cc also: @boklm , @richard

  • aguestuser added 1 commit

    added 1 commit

    • ea9da25f - fixup! (not for merge) local and/or temporary changes

    Compare with previous version

  • aguestuser changed the description

    changed the description

  • aguestuser added 1 commit

    added 1 commit

    • 3eea3edb - fixup! (not for merge) local and/or temporary changes

    Compare with previous version

  • aguestuser resolved all threads

    resolved all threads

  • aguestuser mentioned in merge request !406 (merged)

    mentioned in merge request !406 (merged)

  • closed

  • aguestuser
    aguestuser @aguestuser started a thread on commit bbb3433e
  • 8 8
    9 9 tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %]
    10 10
    11 pushd $ANDROID_HOME/tools/bin
    12 yes | JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64 ./sdkmanager --licenses
    13 popd
    • Comment on lines +11 to +13

      @sysrqb whoops, i neglected to omit this from "clean" version of "android-component part" commit in !406 (merged)

      should i:

      1. push a fix-up commit to my mozilla96-clean branch on which that MR is based (and make yet-another MR after review in which it has been autosquashed?)
      2. autosquash locally and force push onto that MR's branch right now?

      i know that (1) is generally our preference, but given small size of the change and trying to get v96 over the line, seemed possibly acceptable?

      lemme know!

    • Please register or sign in to reply
  • mentioned in issue #40433 (closed)

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading