Unverified Commit c5f19433 authored by boklm's avatar boklm Committed by Matthew Finkel
Browse files

Bug 40312: Update components for mozilla90: android-components part

The componets/browser/engine-gecko-beta and componets/browser/engine-gecko-nightly
directories have been removed from android-components:
https://mozac.org/rfc/0007-synchronized-releases
parent c3f23574
......@@ -60,24 +60,9 @@ patch -p1 < $rootdir/git.patch
exit 1
fi
# We want to make sure only our code is built. Overwrite engine-gecko code we
# don't need.
cd components/browser
[% IF c("var/release") %]
rm -rf engine-gecko-beta/src/*
rm -rf engine-gecko-nightly/src/*
cp -rf engine-gecko/src/* engine-gecko-beta/src/
cp -rf engine-gecko/src/* engine-gecko-nightly/src/
[% ELSE %]
rm -rf engine-gecko/src/*
rm -rf engine-gecko-nightly/src/*
cp -rf engine-gecko-beta/src/* engine-gecko/src/
cp -rf engine-gecko-beta/src/* engine-gecko-nightly/src/
[% END %]
cd ../../
gradle_args="--offline --no-daemon -Dmaven.repo.local=$gradle_repo"
gradle $gradle_args assembleGecko[% c('variant') %] -x lint
gradle $gradle_args assembleGecko -x lint
gradle $gradle_args publish
# We only need the archives and .pom files for now.
......
......@@ -8,14 +8,14 @@ gpg_keyring: torbutton.gpg
variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]'
var:
android_components_version: 75.0.22
android_components_version: 90.0.11
torbrowser_branch: 10.5
container:
use_container: 1
# This should be updated when the list of gradle dependencies is changed.
gradle_dependencies_version: 25
gradle_dependencies_version: 26
gradle_version: 6.6.1
glean_parser: 2.2.0
glean_parser: 3.2.0
git_branch: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1'
targets:
......@@ -51,15 +51,15 @@ input_files:
enable: '[% !c("var/fetch_gradle_dependencies") %]'
- URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %].tar.xz
name: glean
sha256sum: 24ceaaadaf155445e8ad135173d894e05c0745b41ab5fee150f9548550acf2a6
sha256sum: d87e7049b56d6c4ccb0788f495f1ac9b635bb32074ff66e579fdd3e888ebc0e9
enable: '[% !c("var/fetch_gradle_dependencies") %]'
- filename: gen_gradle_deps_file.sh
enable: '[% c("var/fetch_gradle_dependencies") %]'
steps:
list_toolchain_updates:
git_url: https://github.com/mozilla-mobile/android-components.git
git_hash: v90.0.7
#git_url: https://github.com/mozilla-mobile/android-components.git
#git_hash: v90.0.11
#tag_gpg_id: 0
var:
container:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment