Skip to content

Commit e84bc24

Browse files
committed
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]>
1 parent 6360048 commit e84bc24

File tree

3 files changed

+5
-253
lines changed

3 files changed

+5
-253
lines changed

.cirrus.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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

.github/workflows/meson.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -524,9 +524,8 @@ jobs:
524524
usesh: true
525525
prepare: |
526526
pkg update
527-
pkg install -y curl
528-
pkg install -y ntp
529-
ntpdate -u pool.ntp.org
527+
pkg install -y socat
528+
/usr/sbin/dntpd -s
530529
531530
run: |
532531
pkg install -y meson

.github/workflows/vmactions.yml

Lines changed: 0 additions & 248 deletions
This file was deleted.

0 commit comments

Comments
 (0)