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

Bug 40312: Update components for mozilla90: application-services part

parent b1fd1dd7
......@@ -34,7 +34,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
# Prepare the offline build.
# Move the directory for hardcoding the path in .cargo/config.
mv /var/tmp/build/[% project %]-[% c('version') %] $builddir
tar -C $builddir -xjf application-services-vendor-[% c('var/rust_vendor_version') %].tar.bz2
tar -C $builddir -xjf application-services-vendor-[% c('version') %].tar.bz2
cd $builddir
# Make sure our vendored crates are used for offline builds.
cat >> .cargo/config << 'EOF'
......@@ -58,11 +58,6 @@ sed -i \
uniffi_bindgen/.cargo-checksum.json
popd
patch -p1 < $rootdir/update-cargo-lock.patch
cd components/external/nimbus-sdk
patch -p1 < $rootdir/viaduct-workaround.patch
cd ../../../
# Move NSS and SQLCipher to the right place
# XXX: Maybe merge with the loop above.
archs="armv7 aarch64 x86 x86_64"
......@@ -97,7 +92,7 @@ patch -p1 < $rootdir/target.patch
mv gradle-dependencies-list.txt '[% dest_dir _ "/" _ c("filename") %]'
[% ELSE %]
# Prepare Glean dependencies for offline build
tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2
tar -xf $rootdir/glean-wheels-[% c('var/glean_parser') %].tar.xz
# We need to set `LC_ALL` and `LANG` to something that is not ASCII as encoding
# otherwise `click` barfs. See: https://click.palletsprojects.com/python3/
export LC_ALL=C.UTF-8
......
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
version: 74.0.1
git_hash: ad7b64fa03eeeb00815125e635d1fb8809befd40
version: 77.0.2
git_hash: dd09c25f14dbf45f1637ed8dca2d1e5ff668479f
git_url: https://github.com/mozilla/application-services
git_submodule: 1
......@@ -9,10 +9,9 @@ var:
container:
use_container: 1
# This should be updated when the list of gradle dependencies is changed.
gradle_dependencies_version: 5
# This should be updated when the list of rust dependencies is changed.
rust_vendor_version: 5
gradle_dependencies_version: 6
gradle_version: 6.5
glean_parser: 2.2.0
input_files:
- project: container-image
......@@ -76,18 +75,16 @@ input_files:
name: gradle-dependencies
exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
enable: '[% !c("var/fetch_gradle_dependencies") %]'
- URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[% c('var/glean_parser') %].tar.bz2
sha256sum: 19dbdd4958022a1a638e0217489ab722fe7d4f588f1978a4ae162f93e75694c2
- URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %].tar.xz
sha256sum: 24ceaaadaf155445e8ad135173d894e05c0745b41ab5fee150f9548550acf2a6
enable: '[% !c("var/fetch_gradle_dependencies") %]'
# Use `make cargo_vendor-application-services` to re-generate the vendor tarball
- URL: https://people.torproject.org/~boklm/mirrors/sources/application-services-vendor-[% c('var/rust_vendor_version') %].tar.bz2
sha256sum: 5f1c9e1bc0db283e88516bd1d78187145bacbf4aeb72972ac09875c1147d2215
- URL: https://people.torproject.org/~boklm/mirrors/sources/application-services-vendor-[% c('version') %].tar.bz2
sha256sum: 313c1e9b164ce9905eafe29a913edb617379e6d153ce28fa751d9f544e6e87c8
- filename: no-git.patch
- filename: mavenLocal.patch
enable: '[% !c("var/fetch_gradle_dependencies") %]'
- filename: target.patch
- filename: viaduct-workaround.patch
- filename: update-cargo-lock.patch
- filename: gen_gradle_deps_file.sh
enable: '[% c("var/fetch_gradle_dependencies") %]'
- filename: 0001-Store-the-universe-of-known-types-in-an-ordered-BTre.patch
......@@ -123,13 +120,6 @@ steps:
cargo_vendor:
filename: '[% project %]-vendor-[% c("version") %].tar.bz2'
var:
cargo_vendor_opts: '-s components/external/nimbus-sdk/nimbus/Cargo.toml'
pre_cargo_vendor: |
patch -p1 < $rootdir/update-cargo-lock.patch
patch -d components/external/nimbus-sdk -p1 < $rootdir/viaduct-workaround.patch
input_files:
- project: container-image
pkg_type: build
- filename: viaduct-workaround.patch
- filename: update-cargo-lock.patch
This diff is collapsed.
From 4a7eb7890108939993444ad350dd064dc7448160 Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk@torproject.org>
Date: Wed, 2 Dec 2020 09:26:24 +0000
Subject: [PATCH] Bug 40156: viaduct*-workaround
See: https://github.com/mozilla/application-services/issues/3732.
---
nimbus/Cargo.toml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nimbus/Cargo.toml b/nimbus/Cargo.toml
index 4dc51b3..0e30dd0 100644
--- a/nimbus/Cargo.toml
+++ b/nimbus/Cargo.toml
@@ -26,7 +26,7 @@ serde_derive = "1"
serde_json = "1"
log = "0.4"
# Viaduct locked to version same version of app-services as mozilla-central
-viaduct = { git = "https://github.com/mozilla/application-services", rev = "8a576fbe79199fa8664f64285524017f74ebcc5f"}
+viaduct = { path = "../../../viaduct" }
thiserror = "1"
url = "2.1"
rkv = "0.17"
@@ -41,7 +41,7 @@ uniffi = { version = "^0.8.0", optional = true }
uniffi_build = { version = "^0.8.0", features = [ "builtin-bindgen" ], optional = true }
[dev-dependencies]
-viaduct-reqwest = { git = "https://github.com/mozilla/application-services", rev = "8a576fbe79199fa8664f64285524017f74ebcc5f"}
+viaduct-reqwest = { path = "../../../support/viaduct-reqwest" }
mockito = "0.27"
env_logger = "0.7"
clap = "2.33.3"
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