Skip to content

Commit 8c0d1c6

Browse files
committed
Merge bitcoin/bitcoin#29218: ci: Rename tasks (previous releases, macOS cross)
fa0c594 ci: Rename tasks (previous releases, macOS cross) (MarcoFalke) Pull request description: The previous releases task no longer uses the qt5 dev package, but the depends package, so fix that in the name. Also, remove a detail from the macOS cross task name, because anyone can look it up in the source, if they really want to. Otherwise, it may go out of date in the name. Also, rename the two tasks' config file to reflect the same. ACKs for top commit: fanquake: ACK fa0c594 Tree-SHA512: e6f1d04128d35462c49367c98a0227988695d75add88c569804551e3fd30c22292d22b88fa19c54f02fab0c9784c77a078447de0280553a3fc7162dcf992d7ae
2 parents 4baa162 + fa0c594 commit 8c0d1c6

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.cirrus.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,13 @@ task:
132132
FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
133133

134134
task:
135-
name: 'previous releases, qt5 dev package and depends packages, DEBUG'
135+
name: 'previous releases, depends DEBUG'
136136
<< : *GLOBAL_TASK_TEMPLATE
137137
persistent_worker:
138138
labels:
139139
type: small
140140
env:
141-
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
141+
FILE_ENV: "./ci/test/00_setup_env_native_previous_releases.sh"
142142

143143
task:
144144
name: 'TSan, depends, gui'
@@ -200,10 +200,10 @@ task:
200200
FILE_ENV: "./ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh"
201201

202202
task:
203-
name: 'macOS-cross 11.0, gui, no tests'
203+
name: 'macOS-cross, gui, no tests'
204204
<< : *GLOBAL_TASK_TEMPLATE
205205
persistent_worker:
206206
labels:
207207
type: small
208208
env:
209-
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
209+
FILE_ENV: "./ci/test/00_setup_env_mac_cross.sh"
File renamed without changes.

ci/test/00_setup_env_native_qt5.sh renamed to ci/test/00_setup_env_native_previous_releases.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CONTAINER_NAME=ci_native_qt5
9+
export CONTAINER_NAME=ci_native_previous_releases
1010
export CI_IMAGE_NAME_TAG="docker.io/debian:bullseye"
1111
# Use minimum supported python3.9 and gcc-10, see doc/dependencies.md
1212
export PACKAGES="gcc-10 g++-10 python3-zmq"

0 commit comments

Comments
 (0)