Skip to content

Commit

Permalink
2022.4 (#601)
Browse files Browse the repository at this point in the history 
* Merge with Firefox 99
* Build: handle toolchains aliases
* Consolidating cleaning up preferences into single patch
  • Loading branch information
@chrmod
chrmod authored Apr 13, 2022
1 parent a330958 commit 7945346
Show file tree
Hide file tree
Showing 58 changed files with 285 additions and 307 deletions.
6 changes: 3 additions & 3 deletions .workspace
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
"pictureinpicture",
"report-site-issue"
],
"firefox": "97.0.2",
"app": "2022.3.1",
"firefox": "99.0",
"app": "2022.4",
"s3bucket": "ghostery-user-agent-cache-public",
"locales": {
"de": "3aa060a4eb096bff283d9672f6983375367d5a6f",
"fr": "bf61dd44e1c6b5292077ca980a4dc0e2c6a17f06"
}
}
}
22 changes: 11 additions & 11 deletions build/Linux.dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,57 +3,57 @@ FROM ua-build-base
ENV MOZ_AUTOMATION_PACKAGE_TESTS=1 \
MOZ_ENABLE_FULL_SYMBOLS=1

RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-binutils/binutils.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-binutils/binutils.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf binutils.tar.zst && \
rm binutils.tar.zst

RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-clang-13/clang.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-clang-13/clang.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf clang.tar.zst && \
rm clang.tar.zst

RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-rust-1.57/rustc.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-rust-1.59/rustc.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf rustc.tar.zst && \
rm rustc.tar.zst

RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-rust-size/rust-size.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-rust-size/rust-size.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf rust-size.tar.zst && \
rm rust-size.tar.zst

RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-cbindgen/cbindgen.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-cbindgen/cbindgen.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf cbindgen.tar.zst && \
rm cbindgen.tar.zst

RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-dump_syms/dump_syms.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-dump_syms/dump_syms.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf dump_syms.tar.zst && \
rm dump_syms.tar.zst

RUN wget -nv -O /builds/worker/fetches/sccache.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-sccache/sccache.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/sccache.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-sccache/sccache.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sccache.tar.zst && \
rm sccache.tar.zst

RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-nasm/nasm.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-nasm/nasm.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf nasm.tar.zst && \
rm nasm.tar.zst

RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-node-12/node.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-node-12/node.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf node.tar.zst && \
rm node.tar.zst

RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sysroot-x86_64-linux-gnu.tar.zst && \
rm sysroot-x86_64-linux-gnu.tar.zst

RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/sysroot-wasm32-wasi/sysroot-wasm32-wasi.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/sysroot-wasm32-wasi/sysroot-wasm32-wasi.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sysroot-wasm32-wasi.tar.zst && \
rm sysroot-wasm32-wasi.tar.zst
Expand Down
26 changes: 13 additions & 13 deletions build/MacOSARM.dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,67 +3,67 @@ FROM ua-build-base
ENV MOZ_AUTOMATION_PACKAGE_TESTS=1 \
PERFHERDER_EXTRA_OPTIONS=aarch64

RUN wget -nv -O /builds/worker/fetches/cctools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-cctools-port-clang-13/cctools.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/cctools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-cctools-port/cctools.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf cctools.tar.zst && \
rm cctools.tar.zst

RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-clang-13-macosx-cross/clang.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-clang-13/clang.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf clang.tar.zst && \
rm clang.tar.zst

RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/sysroot-wasm32-wasi/sysroot-wasm32-wasi.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/sysroot-wasm32-wasi/sysroot-wasm32-wasi.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sysroot-wasm32-wasi.tar.zst && \
rm sysroot-wasm32-wasi.tar.zst

RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-binutils/binutils.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-binutils/binutils.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf binutils.tar.zst && \
rm binutils.tar.zst

RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-dump_syms/dump_syms.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-dump_syms/dump_syms.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf dump_syms.tar.zst && \
rm dump_syms.tar.zst

RUN wget -nv -O /builds/worker/fetches/hfsplus-tools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-hfsplus/hfsplus-tools.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/hfsplus-tools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-hfsplus/hfsplus-tools.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf hfsplus-tools.tar.zst && \
rm hfsplus-tools.tar.zst

RUN wget -nv -O /builds/worker/fetches/dmg.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-libdmg/dmg.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/dmg.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-libdmg/dmg.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf dmg.tar.zst && \
rm dmg.tar.zst

RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-rust-macos-1.57/rustc.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-rust-macos-1.59/rustc.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf rustc.tar.zst && \
rm rustc.tar.zst

RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-rust-size/rust-size.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-rust-size/rust-size.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf rust-size.tar.zst && \
rm rust-size.tar.zst

RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-cbindgen/cbindgen.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-cbindgen/cbindgen.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf cbindgen.tar.zst && \
rm cbindgen.tar.zst

RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-nasm/nasm.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-nasm/nasm.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf nasm.tar.zst && \
rm nasm.tar.zst

RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-node-12/node.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-node-12/node.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf node.tar.zst && \
rm node.tar.zst

RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sysroot-x86_64-linux-gnu.tar.zst && \
rm sysroot-x86_64-linux-gnu.tar.zst
Expand Down
28 changes: 14 additions & 14 deletions build/MacOSX.dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,72 +2,72 @@ FROM ua-build-base

ENV MOZ_AUTOMATION_PACKAGE_TESTS=1

RUN wget -nv -O /builds/worker/fetches/cctools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-cctools-port-clang-13/cctools.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/cctools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-cctools-port/cctools.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf cctools.tar.zst && \
rm cctools.tar.zst

RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-clang-13-macosx-cross/clang.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-clang-13/clang.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf clang.tar.zst && \
rm clang.tar.zst

RUN wget -nv -O /builds/worker/fetches/sccache.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-sccache/sccache.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/sccache.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-sccache/sccache.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sccache.tar.zst && \
rm sccache.tar.zst

RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/sysroot-wasm32-wasi/sysroot-wasm32-wasi.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/sysroot-wasm32-wasi/sysroot-wasm32-wasi.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sysroot-wasm32-wasi.tar.zst && \
rm sysroot-wasm32-wasi.tar.zst

RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-binutils/binutils.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/binutils.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-binutils/binutils.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf binutils.tar.zst && \
rm binutils.tar.zst

RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-dump_syms/dump_syms.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-dump_syms/dump_syms.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf dump_syms.tar.zst && \
rm dump_syms.tar.zst

RUN wget -nv -O /builds/worker/fetches/hfsplus-tools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-hfsplus/hfsplus-tools.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/hfsplus-tools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-hfsplus/hfsplus-tools.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf hfsplus-tools.tar.zst && \
rm hfsplus-tools.tar.zst

RUN wget -nv -O /builds/worker/fetches/dmg.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-libdmg/dmg.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/dmg.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-libdmg/dmg.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf dmg.tar.zst && \
rm dmg.tar.zst

RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-rust-macos-1.57/rustc.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-rust-macos-1.59/rustc.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf rustc.tar.zst && \
rm rustc.tar.zst

RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-rust-size/rust-size.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-rust-size/rust-size.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf rust-size.tar.zst && \
rm rust-size.tar.zst

RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-cbindgen/cbindgen.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-cbindgen/cbindgen.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf cbindgen.tar.zst && \
rm cbindgen.tar.zst

RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-nasm/nasm.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-nasm/nasm.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf nasm.tar.zst && \
rm nasm.tar.zst

RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/linux64-node-12/node.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/linux64-node-12/node.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf node.tar.zst && \
rm node.tar.zst

RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/96.0.1/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/99.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \
cd /builds/worker/fetches/ && \
tar -xf sysroot-x86_64-linux-gnu.tar.zst && \
rm sysroot-x86_64-linux-gnu.tar.zst
Expand Down
Loading

0 comments on commit 7945346

Please sign in to comment.