зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1432397 - Switch mingw builds to a Debian stretch-based docker image. r=dustin
Don't build ucl when building upx, Debian stretch has a recent enough version. In fact, the last upstream version doesn't build with GCC in Debian stretch (http://bugs.debian.org/811707) --HG-- extra : rebase_source : aae67773b9dd3b99f6ddf9ab7f59a628037e6925
This commit is contained in:
Родитель
57731e3f90
Коммит
520f9865db
|
@ -650,6 +650,7 @@ win32-mingw32/debug:
|
|||
tier: 2
|
||||
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
|
||||
worker:
|
||||
docker-image: {in-tree: mingw32-build}
|
||||
max-run-time: 7200
|
||||
run:
|
||||
using: mozharness
|
||||
|
|
|
@ -79,6 +79,9 @@ jobs:
|
|||
android-build:
|
||||
symbol: I(agb)
|
||||
parent: debian9-base
|
||||
mingw32-build:
|
||||
symbol: I(mingw)
|
||||
parent: debian9-base
|
||||
index-task:
|
||||
symbol: I(idx)
|
||||
funsize-update-generator:
|
||||
|
|
|
@ -482,7 +482,7 @@ linux64-upx:
|
|||
tier: 2
|
||||
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
|
||||
worker:
|
||||
docker-image: {in-tree: desktop-build}
|
||||
docker-image: {in-tree: mingw32-build}
|
||||
max-run-time: 3600
|
||||
run:
|
||||
using: toolchain-script
|
||||
|
@ -498,7 +498,7 @@ linux64-wine:
|
|||
tier: 2
|
||||
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
|
||||
worker:
|
||||
docker-image: {in-tree: desktop-build}
|
||||
docker-image: {in-tree: mingw32-build}
|
||||
max-run-time: 10800
|
||||
run:
|
||||
using: toolchain-script
|
||||
|
@ -514,7 +514,7 @@ linux64-mingw32-gcc:
|
|||
tier: 2
|
||||
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
|
||||
worker:
|
||||
docker-image: {in-tree: desktop-build}
|
||||
docker-image: {in-tree: mingw32-build}
|
||||
max-run-time: 10800
|
||||
run:
|
||||
using: toolchain-script
|
||||
|
@ -532,7 +532,7 @@ linux64-mingw32-nsis:
|
|||
tier: 2
|
||||
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
|
||||
worker:
|
||||
docker-image: {in-tree: desktop-build}
|
||||
docker-image: {in-tree: mingw32-build}
|
||||
max-run-time: 3600
|
||||
run:
|
||||
using: toolchain-script
|
||||
|
@ -550,7 +550,7 @@ linux64-mingw32-fxc2:
|
|||
tier: 2
|
||||
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
|
||||
worker:
|
||||
docker-image: {in-tree: desktop-build}
|
||||
docker-image: {in-tree: mingw32-build}
|
||||
max-run-time: 1800
|
||||
run:
|
||||
using: toolchain-script
|
||||
|
|
|
@ -0,0 +1,53 @@
|
|||
# %ARG DOCKER_IMAGE_PARENT
|
||||
FROM $DOCKER_IMAGE_PARENT
|
||||
MAINTAINER Mike Hommey <mhommey@mozilla.com>
|
||||
|
||||
VOLUME /builds/worker/checkouts
|
||||
VOLUME /builds/worker/workspace
|
||||
VOLUME /builds/worker/tooltool-cache
|
||||
|
||||
ENV XZ_OPT=-T0
|
||||
|
||||
RUN dpkg --add-architecture i386
|
||||
|
||||
# Ideally, we wouldn't need gcc-multilib and the extra linux-libc-dev,
|
||||
# but the latter is required to make the former installable, and the former
|
||||
# because of bug 1409276.
|
||||
RUN apt-get update && \
|
||||
apt-get install \
|
||||
autoconf2.13 \
|
||||
bison \
|
||||
bzip2 \
|
||||
flex \
|
||||
curl \
|
||||
file \
|
||||
gawk \
|
||||
g++-multilib \
|
||||
gnupg \
|
||||
libucl-dev \
|
||||
p7zip-full \
|
||||
scons \
|
||||
tar \
|
||||
unzip \
|
||||
uuid \
|
||||
wget \
|
||||
x11-utils \
|
||||
xvfb \
|
||||
yasm \
|
||||
zip \
|
||||
zlib1g-dev \
|
||||
libfreetype6-dev:i386 \
|
||||
libx11-dev:i386
|
||||
|
||||
# Stubbed out credentials; mozharness looks for this file an issues a WARNING
|
||||
# if it's not found, which causes the build to fail. Note that this needs to
|
||||
# be in the parent of the workspace directory and in the directory where
|
||||
# mozharness is run (not its --work-dir). See Bug 1169652.
|
||||
# %include taskcluster/docker/desktop-build/oauth.txt
|
||||
COPY topsrcdir/taskcluster/docker/desktop-build/oauth.txt /builds/worker/
|
||||
|
||||
# stubbed out buildprops, which keeps mozharness from choking
|
||||
# Note that this needs to be in the parent of the workspace directory and in
|
||||
# the directory where mozharness is run (not its --work-dir)
|
||||
# %include taskcluster/docker/desktop-build/buildprops.json
|
||||
COPY topsrcdir/taskcluster/docker/desktop-build/buildprops.json /builds/worker/
|
|
@ -10,23 +10,10 @@ mkdir -p $INSTALL_DIR/bin
|
|||
|
||||
cd $WORKSPACE
|
||||
|
||||
# --------------
|
||||
|
||||
wget --progress=dot:mega http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz
|
||||
echo "5847003d136fbbca1334dd5de10554c76c755f7c ucl-1.03.tar.gz" | sha1sum -c -
|
||||
tar xf ucl-1.03.tar.gz
|
||||
cd ucl-1.03
|
||||
./configure
|
||||
make -j$(nproc)
|
||||
|
||||
# --------------
|
||||
|
||||
cd ..
|
||||
git clone -n https://github.com/upx/upx.git upx-clone
|
||||
cd upx-clone
|
||||
git checkout d31947e1f016e87f24f88b944439bbee892f0429 # Asserts integrity of the clone (right?)
|
||||
git submodule update --init --recursive
|
||||
export UPX_UCLDIR=$WORKSPACE/ucl-1.03
|
||||
cd src
|
||||
make -j$(nproc)
|
||||
cp upx.out $INSTALL_DIR/bin/upx
|
||||
|
|
Загрузка…
Ссылка в новой задаче