Skip to content

Commit 23c1a1e

Browse files
authored
feat: Merge VMactions CI into meson CI (#252)
* ci: Seeing if I can get omni OS artifacts to upload Signed-off-by: Tyler Erickson <[email protected]> * ci: Adding missing argument to --root-user-action to ignore the warning This VM runs as root so it will install as root. We can do all the venv work...or just ignore this warning and ignoring this warning is fine on a VM that doesn't preserve its state. Signed-off-by: Tyler Erickson <[email protected]> * ci: Adding missing step to create omnios artifacts to upload Signed-off-by: Tyler Erickson <[email protected]> * ci: Getting more verbose output to troubleshoot tar command Signed-off-by: Tyler Erickson <[email protected]> * ci: Passing in DEST_DIR to omnios vm Signed-off-by: Tyler Erickson <[email protected]> * ci: Combining VMActions into main meson CI build script Loading the correct VM Actions into the main meson build script. This will make it easier to generate artifacts and SLSA provenance Signed-off-by: Tyler Erickson <[email protected]> * ci: Resolving DragonflyBSD build error and removing old CI steps Resolving the dragonfly BSD build error (forgot to update install script since it differs from FreeBSD). Removing separate VMActions build script since the meson.yml can handle it all on its own now, including artifacts and SLSA provenance. This should be easier to expand to other support VMActions versions and architectures as that project advances and supports more systems and CPUs. Signed-off-by: Tyler Erickson <[email protected]> * ci: Adding || true after attempting pkg system updates Making sure that after updating pkg in various OS's that it has || true in case no update is necessary so that CI can continue running other steps. Signed-off-by: Tyler Erickson <[email protected]> * ci: Updating cirrus to latest FreeBSD versions Signed-off-by: Tyler Erickson <[email protected]> * lib: Pointing to latest libraries Signed-off-by: Tyler Erickson <[email protected]> * ci: Adding riscv64 builds for freebsd and openbsd. Adding FreeBSD 15 builds. Adding openindiana build Signed-off-by: Tyler Erickson <[email protected]> * ci: Removing freebsd riscv64 and openindiana FreeBSD for riscv64 doesn't support pkg installs right now so we cannot configure necessary tools compatible with the rest of the CI steps. We can revisit this more later. OpenIndiana was recently made available and while this action works, it is extremely slow to install all required build tools...like hours long. Not sure if this is an action issue or OpenIndiana issue. Disabling this for now to revisit again later. Signed-off-by: Tyler Erickson <[email protected]> * ci: Removing FreeBSD 15.0 from CirrusCI since it could not be found Signed-off-by: Tyler Erickson <[email protected]> --------- Signed-off-by: Tyler Erickson <[email protected]>
1 parent b0a792c commit 23c1a1e

File tree

6 files changed

+418
-191
lines changed

6 files changed

+418
-191
lines changed

.cirrus.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ task:
55
GITHUB_TOKEN: ENCRYPTED[!805e0ec3f027150880429055bbe8c175ccb7894d5a62e10935f15c90557bfaff2a004d6184ca88cb00c690fedf7d6134!]
66
freebsd_instance:
77
matrix:
8-
image_family: freebsd-14-2
8+
#image_family: freebsd-15-0
9+
image_family: freebsd-14-3
910
image_family: freebsd-13-5
10-
image_family: freebsd-13-4
1111
install_script: pkg install -y git meson ntp
1212
submodules_script: git submodule update --init --recursive --progress
1313
release_script: |
@@ -22,10 +22,11 @@ task:
2222
meson install -C build
2323
cd $CIRRUS_WORKING_DIR/output
2424
tar cvfJ $CIRRUS_WORKING_DIR/"openSeaChest-$branchName-$(uname -s)-$(uname -r)-$(uname -m).tar.xz" *
25-
$CIRRUS_WORKING_DIR/cirrus_ci_post_freebsd_release.sh
25+
# Removing upload to use the VMActions freebsd build instead so we also get SLSA provenance.
26+
# $CIRRUS_WORKING_DIR/cirrus_ci_post_freebsd_release.sh
2627
binaries_artifacts:
2728
path: openSeaChest-*.tar.xz
28-
29+
2930

3031
task:
3132
name: windowsservercore:visualstudio2019

0 commit comments

Comments
 (0)