From 0d68a088fa9c75d62ff96286b7128d553a82f8a1 Mon Sep 17 00:00:00 2001
From: Dario Lombardo <lomato@gmail.com>
Date: Sat, 8 Feb 2020 13:48:04 +0100
Subject: [PATCH] tools: update pkg in bsd-setup.

This circumvents a buggy pkg version in 11.x.
Move env var to the proper place while here.

Change-Id: Ib527a92cf8b542c8478daddf082c696caa296d80
Reviewed-on: https://code.wireshark.org/review/36055
Reviewed-by: Dario Lombardo <lomato@gmail.com>
---
 .cirrus.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index db59556a1e..5d95c90e30 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -5,9 +5,12 @@ task:
       - image_family: freebsd-13-0-snap
       - image_family: freebsd-12-0
       - image_family: freebsd-11-3-snap
+  env:
+    ASSUME_ALWAYS_YES: YES
   setup_script:
-    - env ASSUME_ALWAYS_YES=YES pkg install bash
-    - env ASSUME_ALWAYS_YES=YES tools/bsd-setup.sh --install-optional
+    - pkg update -f
+    - pkg install bash
+    - tools/bsd-setup.sh --install-optional
   build_script:
     - mkdir build
     - cd build