From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Doug Goldstein <cardoe@cardoe.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Anthony PERARD <anthony.perard@citrix.com>,
Michal Orzel <michal.orzel@amd.com>,
Oleksii Kurochko <oleksii.kurochko@gmail.com>
Subject: [PATCH 2/6] CI: Remove guesswork about which artefacts to preserve
Date: Fri, 30 Dec 2022 00:38:44 +0000 [thread overview]
Message-ID: <20221230003848.3241-3-andrew.cooper3@citrix.com> (raw)
In-Reply-To: <20221230003848.3241-1-andrew.cooper3@citrix.com>
Preserve the artefacts based on the `make` rune we actually ran, rather than
guesswork about which rune we would have run based on other settings.
Note that the ARM qemu smoke tests depend on finding binaries/xen even from
full builds. Also that the Jessie-32 containers build tools but not Xen.
This means the x86_32 builds now store relevant artefacts. No change in other
configurations.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Anthony PERARD <anthony.perard@citrix.com>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
automation/scripts/build | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/automation/scripts/build b/automation/scripts/build
index 5dafa72ba540..8dee1cbbc251 100755
--- a/automation/scripts/build
+++ b/automation/scripts/build
@@ -70,18 +70,24 @@ if [[ "${CC}" == "gcc" && `cc-ver` -lt 0x040600 ]]; then
cfgargs+=("--with-system-seabios=/bin/false")
fi
+# Directory for the artefacts to be dumped into
+mkdir binaries
+
if [[ "${hypervisor_only}" == "y" ]]; then
+ # Xen-only build
make -j$(nproc) xen
+
+ # Preserve artefacts
+ cp xen/xen binaries/xen
else
+ # Full build
./configure "${cfgargs[@]}"
make -j$(nproc) dist
-fi
-# Extract artifacts to avoid getting rewritten by customised builds
-mkdir binaries
-if [[ "${XEN_TARGET_ARCH}" != "x86_32" ]]; then
- cp xen/xen binaries/xen
- if [[ "${hypervisor_only}" != "y" ]]; then
- cp -r dist binaries/
- fi
+ # Preserve artefacts
+ # Note: Some smoke tests depending on finding binaries/xen on a full build
+ # even though dist/ contains everything, while some containers don't even
+ # build Xen
+ cp -r dist binaries/
+ if [[ -f xen/xen ]] ; then cp xen/xen binaries/xen; fi
fi
--
2.11.0
next prev parent reply other threads:[~2022-12-30 0:39 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-30 0:38 [PATCH 0/6] CI: Fixes/cleanup in preparation for RISCV Andrew Cooper
2022-12-30 0:38 ` [PATCH 1/6] CI: Drop automation/configs/ Andrew Cooper
2023-01-02 13:57 ` Michal Orzel
2023-01-04 1:08 ` Stefano Stabellini
2022-12-30 0:38 ` Andrew Cooper [this message]
2023-01-02 14:00 ` [PATCH 2/6] CI: Remove guesswork about which artefacts to preserve Michal Orzel
2023-01-04 12:12 ` Andrew Cooper
2023-01-04 12:18 ` Michal Orzel
2023-01-04 1:10 ` Stefano Stabellini
2023-01-04 1:18 ` Andrew Cooper
2023-01-04 1:22 ` Stefano Stabellini
2022-12-30 0:38 ` [PATCH 3/6] CI: Only calculate ./configure args if needed Andrew Cooper
2023-01-02 14:01 ` Michal Orzel
2023-01-04 1:12 ` Stefano Stabellini
2022-12-30 0:38 ` [PATCH 4/6] CI: Express HYPERVISOR_ONLY in build.yml Andrew Cooper
2022-12-30 10:04 ` Oleksii
2023-01-02 14:05 ` Michal Orzel
2023-01-04 1:15 ` Stefano Stabellini
2023-01-04 1:27 ` Andrew Cooper
2023-01-04 1:36 ` Stefano Stabellini
2023-01-04 1:41 ` Andrew Cooper
2023-01-04 1:48 ` Stefano Stabellini
2023-01-04 1:51 ` Andrew Cooper
2023-01-04 1:55 ` Stefano Stabellini
2022-12-30 0:38 ` [PATCH 5/6] CI: Fix build script when CROSS_COMPILE is in use Andrew Cooper
2023-01-04 1:20 ` Stefano Stabellini
2022-12-30 0:38 ` [PATCH 6/6] CI: Simplify the MUSL check Andrew Cooper
2023-01-04 1:22 ` Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221230003848.3241-3-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=anthony.perard@citrix.com \
--cc=cardoe@cardoe.com \
--cc=michal.orzel@amd.com \
--cc=oleksii.kurochko@gmail.com \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.