Merge branch 'main' into updatecli_43cd02cbfe369d52657ea550b57eca5afc…

…d79931da384311ba0ef3d13d04e97f
jenkins-infra · Dec 22, 2023 · c76ee93 · c76ee93
2 parents 01c5049 + 770569c
commit c76ee93
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/goss/goss-linux.yaml b/goss/goss-linux.yaml
@@ -195,7 +195,7 @@ command:
     exec: yq --version
     exit-status: 0
     stdout:
-      - 4.40.5
+      - 4.25.3
   zip:
     exec: zip -v
     exit-status: 0

diff --git a/goss/goss-windows.yaml b/goss/goss-windows.yaml
@@ -151,7 +151,7 @@ command:
     exec: yq --version
     exit-status: 0
     stdout:
-      - 4.40.5
+      - 4.25.3
 file:
   C:\Program Files\Chromium\Application\:
     contains: []

diff --git a/main.pkr.hcl b/main.pkr.hcl
@@ -6,7 +6,7 @@ packer {
       source  = "github.com/rgl/windows-update"
     }
     azure = {
-      version = "2.0.1"
+      version = "2.0.2"
       source  = "github.com/hashicorp/azure"
     }
     docker = {

diff --git a/provisioning/tools-versions.yml b/provisioning/tools-versions.yml
@@ -37,5 +37,5 @@ updatecli_version: 0.70.0
 vagrant_version: 2.4.0
 windows_pwsh_version: 7.4.0
 xq_version: 1.2.3
-yq_version: 4.40.5
+yq_version: 4.25.3
 playwright_version: 1.40.1
diff --git a/updatecli/updatecli.d/yq.yml b/updatecli/updatecli.d/yq.yml
@@ -27,6 +27,14 @@ sources:
     transformers:
       - trimprefix: v
 
+conditions:
+  checkForChocolateyPackage:
+    kind: http
+    disablesourceinput: true # Do not pass source as argument to the command line
+    spec:
+      url: https://community.chocolatey.org/packages/yq/{{ source "lastReleaseVersion" }}
+      # command: curl https://community.chocolatey.org/packages/awscli/{{ source "lastReleaseVersion" }} --silent --show-error --location --fail --output /dev/null
+
 targets:
   updateVersion:
     name: Update the `yq` version in the provision-env.yml file