Skip to content

Commit fa56d17

Browse files
author
MarcoFalke
committed
ci: Add missing amd64 to win64-cross task
Also, do the same for android, which also fails.
1 parent 7bf078f commit fa56d17

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ci/test/00_setup_env_android.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (c) 2019-2022 The Bitcoin Core developers
3+
# Copyright (c) 2019-present The Bitcoin Core developers
44
# Distributed under the MIT software license, see the accompanying
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

@@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
99
export HOST=aarch64-linux-android
1010
export PACKAGES="unzip openjdk-8-jdk gradle"
1111
export CONTAINER_NAME=ci_android
12-
export CI_IMAGE_NAME_TAG="ubuntu:jammy"
12+
export CI_IMAGE_NAME_TAG="docker.io/amd64/ubuntu:22.04"
1313

1414
export RUN_UNIT_TESTS=false
1515
export RUN_FUNCTIONAL_TESTS=false

ci/test/00_setup_env_win64.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (c) 2019-2022 The Bitcoin Core developers
3+
# Copyright (c) 2019-present The Bitcoin Core developers
44
# Distributed under the MIT software license, see the accompanying
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_win64
10-
export CI_IMAGE_NAME_TAG=ubuntu:22.04 # Check that Jammy can cross-compile to win64
10+
export CI_IMAGE_NAME_TAG="docker.io/amd64/ubuntu:22.04" # Check that Jammy can cross-compile to win64
1111
export HOST=x86_64-w64-mingw32
1212
export DPKG_ADD_ARCH="i386"
1313
export PACKAGES="nsis g++-mingw-w64-x86-64-posix wine-binfmt wine64 wine32 file"

0 commit comments

Comments
 (0)