fixup! fixup! fixup! fixup! ci(freebsd): fix build failure related to…

… `aws-lc`
rust-lang · Aug 1, 2024 · eb3e2e7 · eb3e2e7
1 parent 42c6dd3
commit eb3e2e7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1302,7 +1302,9 @@ jobs:
         usesh: true
         copyback: false
         prepare: |
-          pkg install -y git gmake bash sudo cmake-core llvm-devel-lite
+          pkg install -y git gmake bash sudo \
+            # The following are required by `aws-lc-rs`:
+            cmake-core llvm-devel-lite rust-bindgen-cli
         run: |
           echo "========="
           echo "create non-root user and log into it"
@@ -1332,7 +1334,9 @@ jobs:
         usesh: true
         copyback: false
         prepare: |
-          pkg install -y git gmake bash sudo cmake-core llvm-devel-lite
+          pkg install -y git gmake bash sudo \
+            # The following are required by `aws-lc-rs`:
+            cmake-core llvm-devel-lite rust-bindgen-cli
         run: |
           echo "========="
           echo "create non-root user and log into it"

diff --git a/ci/actions-templates/freebsd-builds-template.yaml b/ci/actions-templates/freebsd-builds-template.yaml
@@ -22,7 +22,9 @@ jobs: # skip-master skip-stable
         usesh: true
         copyback: false
         prepare: |
-          pkg install -y git gmake bash sudo cmake-core llvm-devel-lite
+          pkg install -y git gmake bash sudo \
+            # The following are required by `aws-lc-rs`:
+            cmake-core llvm-devel-lite rust-bindgen-cli
         run: |
           echo "========="
           echo "create non-root user and log into it"

diff --git a/ci/freebsd/script.bash b/ci/freebsd/script.bash
@@ -43,7 +43,6 @@ export BUILD_PROFILE="release"
 
 # HACK: Works around `aws-lc-rs`' issue with internal bindgen on FreeBSD.
 # See: https://github.com/aws/aws-lc-rs/issues/476#issuecomment-2263118015
-cargo install --force --locked bindgen-cli
 export AWS_LC_SYS_EXTERNAL_BINDGEN=1
 
 bash ci/run.bash