Skip to content

Commit 358580b

Browse files
committed
Merge branch 'develop' into feature/JSON_Format
2 parents 0703cbb + 7a21440 commit 358580b

30 files changed

+1935
-317
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 cmake 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)