Skip to content

Commit aa81985

Browse files
committed
ci: update cirrus-ci FreeBSD versions (#1400)
* ci: update cirrus-ci FreeBSD versions Looks like the newest available FreeBSD images are 13-2 and 14-0, and the previously used ones aren't available anymore. * comment
1 parent fd05d11 commit aa81985

File tree

2 files changed

+18
-25
lines changed

2 files changed

+18
-25
lines changed

.cirrus.yml

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
%YAML 1.1
22
---
33
# Configuration for CirrusCI. This is primarily used for testing and building FreeBSD and macOS M1, since other
4-
# CI platforms don't seem to support these platforms as of writing.
4+
# CI platforms don't seem to support these platforms as of writing (GH may support M1 soon though).
55
#
6-
# Note that we set the YAML directive above to prevent some linting errors around the
7-
# templates.
6+
# Note that we set the YAML directive above to prevent some linting errors around the templates.
87

98
setup_template: &SETUP_TEMPLATE
109
setup_script:
@@ -45,12 +44,12 @@ test_task:
4544
timeout_in: "20m"
4645
skip: "!changesInclude('.cargo/**', '.cirrus.yml', 'sample_configs/**', 'src/**', 'tests/**', 'build.rs', 'Cargo.lock', 'Cargo.toml', 'clippy.toml', 'rustfmt.toml')"
4746
matrix:
48-
- name: "FreeBSD 13 Test"
47+
- name: "FreeBSD 14 Test"
4948
freebsd_instance:
50-
image_family: freebsd-13-1
51-
- name: "FreeBSD 12 Test"
49+
image_family: freebsd-14-0
50+
- name: "FreeBSD 13 Test"
5251
freebsd_instance:
53-
image_family: freebsd-12-3
52+
image_family: freebsd-13-2
5453
- name: "macOS M1 Test"
5554
macos_instance:
5655
image: ghcr.io/cirruslabs/macos-monterey-base:latest
@@ -80,20 +79,20 @@ build_task:
8079
MANPAGE_DIR: "target/tmp/bottom/manpage/"
8180
# -PLACEHOLDER FOR CI-
8281
matrix:
83-
- name: "FreeBSD 13 Build"
84-
alias: "freebsd_13_1_build"
82+
- name: "FreeBSD 14 Build"
83+
alias: "freebsd_14_0_build"
8584
freebsd_instance:
86-
image_family: freebsd-13-1
85+
image_family: freebsd-14-0
8786
env:
8887
TARGET: "x86_64-unknown-freebsd"
89-
NAME: "x86_64-unknown-freebsd-13-1"
90-
- name: "FreeBSD 12 Build"
91-
alias: "freebsd_12_3_build"
88+
NAME: "x86_64-unknown-freebsd-14-0"
89+
- name: "FreeBSD 13 Build"
90+
alias: "freebsd_13_2_build"
9291
freebsd_instance:
93-
image_family: freebsd-12-3
92+
image_family: freebsd-13-2
9493
env:
9594
TARGET: "x86_64-unknown-freebsd"
96-
NAME: "x86_64-unknown-freebsd-12-3"
95+
NAME: "x86_64-unknown-freebsd-13-2"
9796
- name: "macOS M1 Build"
9897
alias: "macos_build"
9998
macos_instance:

scripts/cirrus/build.py

+4-10
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
URL = "https://api.cirrus-ci.com/graphql"
2020
TASKS = [
21-
("freebsd_12_3_build", "bottom_x86_64-unknown-freebsd-12-3.tar.gz"),
22-
("freebsd_13_1_build", "bottom_x86_64-unknown-freebsd-13-1.tar.gz"),
21+
("freebsd_12_3_build", "bottom_x86_64-unknown-freebsd-13-2.tar.gz"),
22+
("freebsd_13_1_build", "bottom_x86_64-unknown-freebsd-14-0.tar.gz"),
2323
("macos_build", "bottom_aarch64-apple-darwin.tar.gz"),
2424
]
2525
DL_URL_TEMPLATE = "https://api.cirrus-ci.com/v1/artifact/build/%s/%s/binaries/%s"
@@ -31,9 +31,7 @@ def make_query_request(key: str, branch: str, build_type: str):
3131

3232
# Dumb but if it works...
3333
config_override = (
34-
Path(".cirrus.yml")
35-
.read_text()
36-
.replace("# -PLACEHOLDER FOR CI-", 'BTM_BUILD_RELEASE_CALLER: "nightly"')
34+
Path(".cirrus.yml").read_text().replace("# -PLACEHOLDER FOR CI-", 'BTM_BUILD_RELEASE_CALLER: "nightly"')
3735
)
3836
query = """
3937
mutation CreateCirrusCIBuild (
@@ -192,11 +190,7 @@ def main():
192190
# Sleep for a minute if something went wrong, just in case.
193191
sleep(60)
194192
else:
195-
print(
196-
"Build failed to complete after {} minutes, bailing.".format(
197-
MINUTES
198-
)
199-
)
193+
print("Build failed to complete after {} minutes, bailing.".format(MINUTES))
200194

201195
if not success:
202196
exit(2)

0 commit comments

Comments
 (0)