AAE-4310 Bump yq version for release (#8)

Alfresco · Mar 5, 2021 · 75d22c3 · 75d22c3
1 parent 96f632a
commit 75d22c3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/.github/actions/setup-yq/action.yml b/.github/actions/setup-yq/action.yml
@@ -4,7 +4,7 @@ inputs:
   version:
     description: 'Version of yq'
     required: false
-    default: 3.4.1
+    default: 4.6.1
 runs:
   using: "composite"
   steps:
@@ -14,8 +14,7 @@ runs:
         TOOL_REPO=mikefarah/$TOOL_NAME
         TOOL_OS=$(uname | tr '[:upper:]' '[:lower:]')
         TOOL_ARCH=amd64
-        curl -fsSLo $TOOL_NAME https://github.com/$TOOL_REPO/releases/download/$TOOL_VERSION/${TOOL_NAME}_${TOOL_OS}_${TOOL_ARCH}
-        chmod +x $TOOL_NAME
-        sudo mv $TOOL_NAME /usr/local/bin/
+        curl -fsSL https://github.com/$TOOL_REPO/releases/download/v$TOOL_VERSION/${TOOL_NAME}_${TOOL_OS}_${TOOL_ARCH}.tar.gz | tar xz
+        sudo mv ${TOOL_NAME}_${TOOL_OS}_${TOOL_ARCH} /usr/local/bin/$TOOL_NAME
         echo $($TOOL_NAME --version)
       shell: bash
diff --git a/.travis.yq_install.yml b/.travis.yq_install.yml
@@ -1,14 +1,19 @@
 import:
   - source: Alfresco/alfresco-build-tools:[email protected]
-env:
-  global:
-    - YQ_VERSION=${YQ_VERSION:-3.4.1}
 before_install:
   - |-
+    TOOL_VERSION=${YQ_VERSION:-4.6.1}
+    TOOL_NAME=yq
+    TOOL_REPO=mikefarah/$TOOL_NAME
+    TOOL_OS=$(uname | tr '[:upper:]' '[:lower:]')
+    TOOL_ARCH=amd64
     if [[ "$TRAVIS_OS_NAME" == "windows" ]]
     then
-      curl -fsSLo yq.exe https://github.com/mikefarah/yq/releases/download/$YQ_VERSION/yq_$(uname | tr '[:upper:]' '[:lower:]')_amd64.exe && chmod +x yq.exe && mv yq.exe $HOME/bin/
+      curl -fsSLO https://github.com/$TOOL_REPO/releases/download/v$TOOL_VERSION/${TOOL_NAME}_${TOOL_OS}_${TOOL_ARCH}.zip
+      unzip ${TOOL_NAME}_${TOOL_OS}_${TOOL_ARCH}.zip
+      mv ${TOOL_NAME}_${TOOL_OS}_${TOOL_ARCH}.exe $HOME/bin/$TOOL_NAME.exe
     else
-      curl -fsSLo yq https://github.com/mikefarah/yq/releases/download/$YQ_VERSION/yq_$(uname | tr '[:upper:]' '[:lower:]')_amd64 && chmod +x yq && mv yq $HOME/bin/
+      curl -fsSL https://github.com/$TOOL_REPO/releases/download/v$TOOL_VERSION/${TOOL_NAME}_${TOOL_OS}_${TOOL_ARCH}.tar.gz | tar xz
+      mv ${TOOL_NAME}_${TOOL_OS}_${TOOL_ARCH} $HOME/bin/$TOOL_NAME
     fi
-    yq --version
+    echo $($TOOL_NAME --version)