diff --git a/taskcluster/ci/docker-image/kind.yml b/taskcluster/ci/docker-image/kind.yml index 5793d791d8dd..d26e33f7846d 100644 --- a/taskcluster/ci/docker-image/kind.yml +++ b/taskcluster/ci/docker-image/kind.yml @@ -72,6 +72,10 @@ jobs: packages: - deb7-cmake - deb7-ninja + deb9-toolchain-build: + symbol: I(deb9-toolchain) + parent: debian9-base + definition: toolchain-build deb10-toolchain-build: symbol: I(deb10-toolchain) parent: debian10-base diff --git a/taskcluster/ci/fetch/toolchains.yml b/taskcluster/ci/fetch/toolchains.yml index b1cb067cc4cb..ea294cf93a1b 100644 --- a/taskcluster/ci/fetch/toolchains.yml +++ b/taskcluster/ci/fetch/toolchains.yml @@ -269,13 +269,13 @@ upx-3.95-win: sha256: 5c076f87ba64d82f11513f4af0ceb07246a3540aa3c72ca3ffc2d53971fa56e3 size: 462820 -wine-3.0.3: - description: wine-3.0.3.tar.xz +wine-5.0: + description: wine-5.0.tar.xz fetch: type: static-url - url: http://dl.winehq.org/wine/source/3.0/wine-3.0.3.tar.xz - sha256: eb645999ea6f6455a5275bf267e19a32497c8f5aac818ea40afe7c8c396a4da1 - size: 19735412 + url: https://dl.winehq.org/wine/source/5.0/wine-5.0.tar.xz + sha256: 181550ba69a80b00c631f80c28ff7642264613bbecdb0c0fc04d6534866713b4 + size: 22469428 gpg-signature: sig-url: "{url}.sign" key-path: build/unix/build-gcc/DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D.key diff --git a/taskcluster/ci/toolchain/misc.yml b/taskcluster/ci/toolchain/misc.yml index c15425f766d7..05db59278941 100644 --- a/taskcluster/ci/toolchain/misc.yml +++ b/taskcluster/ci/toolchain/misc.yml @@ -244,13 +244,14 @@ linux64-wine: symbol: TL(wine) tier: 1 worker: + docker-image: {in-tree: deb9-toolchain-build} max-run-time: 10800 run: script: build-wine.sh toolchain-artifact: public/build/wine.tar.xz fetches: fetch: - - wine-3.0.3 + - wine-5.0 win32-pdbstr: description: "pdbstr for 32-bits Windows" diff --git a/taskcluster/scripts/misc/build-wine.sh b/taskcluster/scripts/misc/build-wine.sh index b0e685fe1d9c..f1ebba755365 100755 --- a/taskcluster/scripts/misc/build-wine.sh +++ b/taskcluster/scripts/misc/build-wine.sh @@ -9,11 +9,11 @@ mkdir -p $WORKSPACE/build/wine mkdir -p $WORKSPACE/build/wine64 cd $WORKSPACE/build/wine64 -$MOZ_FETCHES_DIR/wine-3.0.3/configure --enable-win64 --without-x --without-freetype --prefix=$INSTALL_DIR/ +$MOZ_FETCHES_DIR/wine-5.0/configure --enable-win64 --without-x --without-freetype --prefix=$INSTALL_DIR/ make -j$(nproc) cd $WORKSPACE/build/wine -$MOZ_FETCHES_DIR/wine-3.0.3/configure --with-wine64=../wine64 --without-x --without-freetype --prefix=$INSTALL_DIR/ +$MOZ_FETCHES_DIR/wine-5.0/configure --with-wine64=../wine64 --without-x --without-freetype --prefix=$INSTALL_DIR/ make -j$(nproc) make install