diff options
| author | fanquake <fanquake@gmail.com> | 2024-01-12 09:52:41 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-01-12 09:56:53 +0000 |
| commit | 8c0d1c6cc2629413a487995263c36e3886cba506 (patch) | |
| tree | a80d416af238e9c95014db4b130668405bc4fe13 | |
| parent | 4baa162dbb3c6464e196a4a21fe63794859021b4 (diff) | |
| parent | fa0c594b33970e12d97e6879ab4ca57045453492 (diff) | |
Merge bitcoin/bitcoin#29218: ci: Rename tasks (previous releases, macOS cross)
fa0c594b33970e12d97e6879ab4ca57045453492 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 fa0c594b33970e12d97e6879ab4ca57045453492
Tree-SHA512: e6f1d04128d35462c49367c98a0227988695d75add88c569804551e3fd30c22292d22b88fa19c54f02fab0c9784c77a078447de0280553a3fc7162dcf992d7ae
| -rw-r--r-- | .cirrus.yml | 8 | ||||
| -rwxr-xr-x | ci/test/00_setup_env_mac_cross.sh (renamed from ci/test/00_setup_env_mac.sh) | 0 | ||||
| -rwxr-xr-x | ci/test/00_setup_env_native_previous_releases.sh (renamed from ci/test/00_setup_env_native_qt5.sh) | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index eb2414dc0a..6628d0bbbb 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -132,13 +132,13 @@ task: FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh" task: - name: 'previous releases, qt5 dev package and depends packages, DEBUG' + name: 'previous releases, depends DEBUG' << : *GLOBAL_TASK_TEMPLATE persistent_worker: labels: type: small env: - FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh" + FILE_ENV: "./ci/test/00_setup_env_native_previous_releases.sh" task: name: 'TSan, depends, gui' @@ -200,10 +200,10 @@ task: FILE_ENV: "./ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh" task: - name: 'macOS-cross 11.0, gui, no tests' + name: 'macOS-cross, gui, no tests' << : *GLOBAL_TASK_TEMPLATE persistent_worker: labels: type: small env: - FILE_ENV: "./ci/test/00_setup_env_mac.sh" + FILE_ENV: "./ci/test/00_setup_env_mac_cross.sh" diff --git a/ci/test/00_setup_env_mac.sh b/ci/test/00_setup_env_mac_cross.sh index 31c4bff6ae..31c4bff6ae 100755 --- a/ci/test/00_setup_env_mac.sh +++ b/ci/test/00_setup_env_mac_cross.sh diff --git a/ci/test/00_setup_env_native_qt5.sh b/ci/test/00_setup_env_native_previous_releases.sh index 2492cfb58c..94e88f872f 100755 --- a/ci/test/00_setup_env_native_qt5.sh +++ b/ci/test/00_setup_env_native_previous_releases.sh @@ -6,7 +6,7 @@ export LC_ALL=C.UTF-8 -export CONTAINER_NAME=ci_native_qt5 +export CONTAINER_NAME=ci_native_previous_releases export CI_IMAGE_NAME_TAG="docker.io/debian:bullseye" # Use minimum supported python3.9 and gcc-10, see doc/dependencies.md export PACKAGES="gcc-10 g++-10 python3-zmq" |