Unverified Commit b3629abd authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Merge remote-tracking branch 'boklmgl/bug_40311'

parents 80e97dcd dac2b35d

projects/android-components/config

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ input_files: 


steps:

  list_toolchain_updates:

    #git_url: https://github.com/mozilla-mobile/android-components.git

    #git_hash: v75.0.22

    git_url: https://github.com/mozilla-mobile/android-components.git

    git_hash: v90.0.7

    #tag_gpg_id: 0

    var:

      container:

projects/application-services/config

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ input_files: 


steps:

  list_toolchain_updates:

    #git_hash: 'v74.0.1'

    git_hash: 'v77.0.2'

    input_files: []

    var:

      container:

projects/application-services/list_toolchain_updates_checks

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ check_update_needed sqlcipher "$needed" "$current" 


# android-gradle-plugin

read -d '' p << 'EOF' || true

if (m/^\\s*ext\\.android_gradle_plugin_version\\s=\\s'([^']*)'/) {

if (m/^\\s*android_gradle_plugin_version\\s=\\s'([^']*)'/) {

  print $1;

  exit;

}
@@ -86,7 +86,7 @@ check_update_needed android-gradle-plugin "$needed" "$current" 


# android-components

read -d '' p << 'EOF' || true

if (m/^\\s*ext\\.android_components_version\\s=\\s'([^']*)'/) {

if (m/^\\s*android_components_version\\s=\\s'([^']*)'/) {

  print $1;

  exit;

}

projects/fenix/config

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ input_files: 


steps:

  list_toolchain_updates:

    #git_url: https://github.com/mozilla-mobile/fenix.git

    #git_hash: v89.1.1

    git_url: https://github.com/mozilla-mobile/fenix.git

    git_hash: v90.0.0-beta.4

    tag_gpg_id: 0

    input_files: []

    var:

projects/geckoview/config

+3 −3
Original line number Diff line number Diff line
@@ -138,9 +138,9 @@ steps: 
          - torbrowser-android-x86_64



  list_toolchain_updates:

    #git_url: https://github.com/mozilla/gecko-dev.git

    # 89.0b10

    #git_hash: 702dfbec3d62823d0dfca870995540383ab39183

    git_url: https://github.com/mozilla/gecko-dev.git

    # 90.0b9

    git_hash: 92485800ccb404788bfd215e59c3850b314d3905

    tag_gpg_id: 0

    input_files: []

    var: