fix: install curl for FreeBSD CI

darfink · Mar 6, 2024 · 3eee0fe · 3eee0fe
1 parent 9117694
commit 3eee0fe
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -84,7 +84,7 @@ jobs:
         include:
           - target: x86_64-unknown-freebsd
             image: https://gitlab.com/kit-ty-kate/qemu-base-images/-/raw/master/FreeBSD-13.2-RELEASE-amd64.qcow2?inline=false
-            md5: 33b6bc89cdc675f5cbaf92e71ae648f8
+            md5: 01ad7883c69476d90872eb38180085c0
             args: -net nic
           - target: x86_64-unknown-openbsd
             image: https://gitlab.com/kit-ty-kate/qemu-base-images/-/raw/master/OpenBSD-7.4-amd64.qcow2?inline=false
@@ -110,7 +110,7 @@ jobs:
       if: steps.lookup-image.outputs.cache-hit != 'true'
       run: |
         wget -O - --progress=dot:mega "${{ matrix.image }}" \
-          | tee ~/image.qcow2 \
+          | tee ~/image.qcow2.xz \
           | md5sum -c <(echo "${{ matrix.md5 }} -")
 
     - name: Boot image
@@ -133,10 +133,13 @@ jobs:
         parallel -t --retries 20 --delay 5 ::: 'sshpass -e ssh-copy-id -o StrictHostKeyChecking=no qemu'
 
     - name: Install toolchain (rustup)
-      if: ${{ !contains(matrix.target, 'openbsd') }}
+      if: ${{ contains(matrix.target, 'freebsd') }}
       run: |
-        ssh qemu "curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal"
-        ssh qemu "ln -s ~/.cargo/bin ~/bin"
+        ssh qemu <<'EOF'
+          pkg install -y curl
+          curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal
+          ln -s ~/.cargo/bin ~/bin
+        EOF
 
     - name: Install toolchain (pkg)
       if: ${{ contains(matrix.target, 'openbsd') }}