From 2143678ddc1eef1fc86b03f9c762f29df155c0d9 Mon Sep 17 00:00:00 2001 From: Mateo Arboleda Date: Fri, 13 Dec 2024 14:24:03 -0500 Subject: [PATCH 1/6] Add checkout test --- .circleci/test-deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml index c91b15f..67d1192 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: @@ -36,6 +36,7 @@ jobs: steps: - jq/install: version: <> + - checkout workflows: integration_tests-prod_deploy: From a0f4dbea1b6b3a458c1c0d4c5db61d3d96b81696 Mon Sep 17 00:00:00 2001 From: Mateo Arboleda Date: Fri, 13 Dec 2024 14:32:27 -0500 Subject: [PATCH 2/6] Update default directory --- src/commands/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/install.yml b/src/commands/install.yml index b5e248e..ff8bd8f 100644 --- a/src/commands/install.yml +++ b/src/commands/install.yml @@ -13,7 +13,7 @@ parameters: install_dir: type: string - default: ~/bin + default: ${HOME}/bin description: > Directory in which to install jq From c320d925e633dd8622d33cac05f54630d742d3c6 Mon Sep 17 00:00:00 2001 From: Mateo Arboleda Date: Fri, 13 Dec 2024 14:43:16 -0500 Subject: [PATCH 3/6] Create directory after var eval --- src/scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/install.sh b/src/scripts/install.sh index be88e78..43ac1f8 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. From cfd4df905a0a81e8e14a47d40b27c074fe32f75d Mon Sep 17 00:00:00 2001 From: Mateo Arboleda Date: Fri, 13 Dec 2024 14:45:32 -0500 Subject: [PATCH 4/6] Reverte default change --- src/commands/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/install.yml b/src/commands/install.yml index ff8bd8f..b5e248e 100644 --- a/src/commands/install.yml +++ b/src/commands/install.yml @@ -13,7 +13,7 @@ parameters: install_dir: type: string - default: ${HOME}/bin + default: ~/bin description: > Directory in which to install jq From 60494a4f5db2a0c1ed01144059fc8fe29004dbb6 Mon Sep 17 00:00:00 2001 From: Mateo Arboleda Date: Fri, 13 Dec 2024 15:31:38 -0500 Subject: [PATCH 5/6] Add tests with overrideQ --- .circleci/test-deploy.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml index 67d1192..1740f7a 100644 --- a/.circleci/test-deploy.yml +++ b/.circleci/test-deploy.yml @@ -32,10 +32,14 @@ jobs: version: type: string default: latest + override: + type: boolean + default: false executor: <> steps: - jq/install: version: <> + override: <> - checkout workflows: @@ -61,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 From 27429cf1edcd1c81a4aafe1df53b6a4df265bb76 Mon Sep 17 00:00:00 2001 From: Mateo Arboleda Date: Fri, 13 Dec 2024 15:39:12 -0500 Subject: [PATCH 6/6] update link for macos installation --- src/scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/install.sh b/src/scripts/install.sh index 43ac1f8..badbda6 100644 --- a/src/scripts/install.sh +++ b/src/scripts/install.sh @@ -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"