Skip to content

Commit

Permalink
ci: update cirrus-ci FreeBSD versions
Browse files Browse the repository at this point in the history
Looks like the newest available FreeBSD images are 13-2 and 14-0, and
the previously used ones aren't available anymore.
  • Loading branch information
ClementTsang committed Jan 28, 2024
1 parent e912550 commit 377430e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 16 deletions.
12 changes: 6 additions & 6 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ test_task:
matrix:
- name: "FreeBSD 13 Test"
freebsd_instance:
image_family: freebsd-13-1
image_family: freebsd-14-0
- name: "FreeBSD 12 Test"
freebsd_instance:
image_family: freebsd-12-3
image_family: freebsd-13-2
- name: "macOS M1 Test"
macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-base:latest
Expand Down Expand Up @@ -83,17 +83,17 @@ build_task:
- name: "FreeBSD 13 Build"
alias: "freebsd_13_1_build"
freebsd_instance:
image_family: freebsd-13-1
image_family: freebsd-14-0
env:
TARGET: "x86_64-unknown-freebsd"
NAME: "x86_64-unknown-freebsd-13-1"
NAME: "x86_64-unknown-freebsd-14-0"
- name: "FreeBSD 12 Build"
alias: "freebsd_12_3_build"
freebsd_instance:
image_family: freebsd-12-3
image_family: freebsd-13-2
env:
TARGET: "x86_64-unknown-freebsd"
NAME: "x86_64-unknown-freebsd-12-3"
NAME: "x86_64-unknown-freebsd-13-2"
- name: "macOS M1 Build"
alias: "macos_build"
macos_instance:
Expand Down
14 changes: 4 additions & 10 deletions scripts/cirrus/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

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

# Dumb but if it works...
config_override = (
Path(".cirrus.yml")
.read_text()
.replace("# -PLACEHOLDER FOR CI-", 'BTM_BUILD_RELEASE_CALLER: "nightly"')
Path(".cirrus.yml").read_text().replace("# -PLACEHOLDER FOR CI-", 'BTM_BUILD_RELEASE_CALLER: "nightly"')
)
query = """
mutation CreateCirrusCIBuild (
Expand Down Expand Up @@ -192,11 +190,7 @@ def main():
# Sleep for a minute if something went wrong, just in case.
sleep(60)
else:
print(
"Build failed to complete after {} minutes, bailing.".format(
MINUTES
)
)
print("Build failed to complete after {} minutes, bailing.".format(MINUTES))

if not success:
exit(2)
Expand Down

0 comments on commit 377430e

Please sign in to comment.