diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml index c91b15f..1740f7a 100644 --- a/.circleci/test-deploy.yml +++ b/.circleci/test-deploy.yml @@ -1,6 +1,6 @@ version: 2.1 orbs: - orb-tools: circleci/orb-tools@12.0 + orb-tools: circleci/orb-tools@12.2 jq: {} filters: &filters tags: @@ -32,10 +32,15 @@ jobs: version: type: string default: latest + override: + type: boolean + default: false executor: <> steps: - jq/install: version: <> + override: <> + - checkout workflows: integration_tests-prod_deploy: @@ -60,7 +65,13 @@ workflows: name: install-latest-docker executor: docker-base context: orb-publisher - + - install: + name: install-jq-1.7-<> + matrix: + parameters: + executor: [alpine, macos, machine, docker-base] + version: jq-1.7 + override: true # older jq - install: name: install-older-alpine diff --git a/src/scripts/install.sh b/src/scripts/install.sh index be88e78..badbda6 100644 --- a/src/scripts/install.sh +++ b/src/scripts/install.sh @@ -1,10 +1,10 @@ #!/bin/sh #shellcheck disable=SC1090,SC3028 # Quietly try to make the install directory. -mkdir -p "${JQ_EVAL_INSTALL_DIR}" JQ_STR_VERSION="$(echo "${JQ_STR_VERSION}" | circleci env subst)" JQ_EVAL_INSTALL_DIR="$(eval echo "${JQ_EVAL_INSTALL_DIR}")" +mkdir -p "${JQ_EVAL_INSTALL_DIR}" # Selectively export the SUDO command, depending if we have permission # for a directory and whether we're running alpine. @@ -51,7 +51,7 @@ JQ_VERSION_NUMBER="$(echo "$JQ_VERSION_NUMBER_STRING" | awk '{print $2}')" # Set binary download URL for specified version # handle mac version if uname -a | grep Darwin > /dev/null 2>&1; then - JQ_BINARY_URL="https://github.com/jqlang/jq/releases/download/${JQ_VERSION}/jq-osx-amd64" + JQ_BINARY_URL="https://github.com/jqlang/jq/releases/download/${JQ_VERSION}/jq-macos-arm64" else # linux version JQ_BINARY_URL="https://github.com/jqlang/jq/releases/download/${JQ_VERSION}/jq-linux64"