From e797d68013e210503048780208d57eca8365c176 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 15 Dec 2023 15:24:36 -0500 Subject: [PATCH] jjb: drop macos-amd64 except for binutils-gdb Our macOS amd64 machine is unsupported and doesn't receive OS updates anymore. Change-Id: I51449a8158423d5dc1f2c736c19bb5d23711015e Signed-off-by: Michael Jeanson --- jobs/babeltrace.yaml | 12 ++++++------ jobs/liburcu.yaml | 2 +- jobs/lttng-tools.yaml | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index f635467..ffcf5c3 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -609,7 +609,7 @@ touchstone: '' - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: macosbuild - platforms: !!python/tuple [macos-amd64, macos-arm64] + platforms: !!python/tuple [macos-arm64] builds: !!python/tuple [std] confs: !!python/tuple [std, prod] filter: '' @@ -677,7 +677,7 @@ - 'dev_review_babeltrace_{version}_{buildtype}': version: master buildtype: macosbuild - platforms: !!python/tuple [macos-amd64, macos-arm64] + platforms: !!python/tuple [macos-arm64] builds: !!python/tuple [std] confs: !!python/tuple [std, prod] filter: '' @@ -715,7 +715,7 @@ - 'dev_review_babeltrace_{version}_{buildtype}': version: ctf2 buildtype: macosbuild - platforms: !!python/tuple [macos-amd64, macos-arm64] + platforms: !!python/tuple [macos-arm64] builds: !!python/tuple [std] confs: !!python/tuple [std, prod] filter: '' @@ -753,7 +753,7 @@ - 'dev_review_babeltrace_{version}_{buildtype}': version: stable-2.0 buildtype: macosbuild - platforms: !!python/tuple [macos-amd64, macos-arm64] + platforms: !!python/tuple [macos-arm64] builds: !!python/tuple [std] confs: !!python/tuple [std, prod] filter: '' @@ -839,7 +839,7 @@ touchstone: '' - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: macosbuild - platforms: !!python/tuple [macos-amd64, macos-arm64] + platforms: !!python/tuple [macos-arm64] builds: !!python/tuple [std] confs: !!python/tuple [std] filter: '' @@ -868,7 +868,7 @@ touchstone: '' - '{job_prefix}babeltrace_{version}_{buildtype}': buildtype: macosbuild - platforms: !!python/tuple [macos-amd64, macos-arm64] + platforms: !!python/tuple [macos-arm64] builds: !!python/tuple [std] confs: !!python/tuple [std, prod] filter: '' diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml index ab50773..fcb0a80 100644 --- a/jobs/liburcu.yaml +++ b/jobs/liburcu.yaml @@ -367,7 +367,7 @@ touchstone: '(build == "std")' - '{job_prefix}liburcu_{version}_{buildtype}': buildtype: macosbuild - platforms: !!python/tuple [macos-amd64, macos-arm64] + platforms: !!python/tuple [macos-arm64] builds: !!python/tuple [std] confs: !!python/tuple [std] touchstone: '(build == "std")' diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index 3ac0814..6e40af0 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -1108,7 +1108,7 @@ buildtype: macosbuild version: master ustversion: master - platforms: !!python/tuple [macos-amd64, macos-arm64] + platforms: !!python/tuple [macos-arm64] builds: !!python/tuple [std] confs: !!python/tuple [relayd-only] urcuversions: !!python/tuple [master] @@ -1227,7 +1227,7 @@ buildtype: macosbuild version: stable-2.13 ustversion: stable-2.13 - platforms: !!python/tuple [macos-amd64, macos-arm64] + platforms: !!python/tuple [macos-arm64] builds: !!python/tuple [std] confs: !!python/tuple [relayd-only] urcuversions: !!python/tuple [stable-0.13] @@ -1336,7 +1336,7 @@ buildtype: macosbuild version: stable-2.12 ustversion: stable-2.12 - platforms: !!python/tuple [macos-amd64, macos-arm64] + platforms: !!python/tuple [macos-arm64] builds: !!python/tuple [std] confs: !!python/tuple [relayd-only] urcuversions: !!python/tuple [stable-0.13] @@ -1523,7 +1523,7 @@ buildtype: macosbuild version: master-staging ustversion: master - platforms: !!python/tuple [macos-amd64, macos-arm64] + platforms: !!python/tuple [macos-arm64] builds: !!python/tuple [std] confs: !!python/tuple [relayd-only] urcuversions: !!python/tuple [master] -- 2.34.1