Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue with non desired folder is created #40

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix issue with non desired folder is created #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2143678
Add checkout test
marboledacci Dec 13, 2024
a0f4dbe
Update default directory
marboledacci Dec 13, 2024
c320d92
Create directory after var eval
marboledacci Dec 13, 2024
cfd4df9
Reverte default change
marboledacci Dec 13, 2024
60494a4
Add tests with overrideQ
marboledacci Dec 13, 2024
27429cf
update link for macos installation
marboledacci Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions .circleci/test-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -32,10 +32,15 @@ jobs:
version:
type: string
default: latest
override:
type: boolean
default: false
executor: <<parameters.executor>>
steps:
- jq/install:
version: <<parameters.version>>
override: <<parameters.override>>
- checkout

workflows:
integration_tests-prod_deploy:
Expand All @@ -60,7 +65,13 @@ workflows:
name: install-latest-docker
executor: docker-base
context: orb-publisher

- install:
name: install-jq-1.7-<<matrix.executor>>
matrix:
parameters:
executor: [alpine, macos, machine, docker-base]
version: jq-1.7
override: true
# older jq
- install:
name: install-older-alpine
Expand Down
4 changes: 2 additions & 2 deletions src/scripts/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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"
Expand Down