diff --git a/.github/scripts/generate-chart-exclude-string.sh b/.github/scripts/generate-chart-exclude-string.sh index db005167..8b2df2f1 100755 --- a/.github/scripts/generate-chart-exclude-string.sh +++ b/.github/scripts/generate-chart-exclude-string.sh @@ -7,7 +7,7 @@ chartDir="$projectRootPath/charts" excludePaths=$( find "$chartDir" -type d -mindepth 1 -maxdepth 1 | sed "s~$projectRootPath/~~" | - egrep -v "^$chartPath$" | + grep -Ev "^$chartPath$" | awk -F "/" '{ print $2 }' | tr '\n' ',' | sed 's/,$//g' diff --git a/.github/scripts/generate-config.sh b/.github/scripts/generate-config.sh index 1f061271..83548208 100755 --- a/.github/scripts/generate-config.sh +++ b/.github/scripts/generate-config.sh @@ -5,21 +5,24 @@ changedCharts=$2 projectRootPath=$(git rev-parse --show-toplevel) if [ "$ciChanged" == false ]; then - charts=($(echo "$changedCharts" | + chartStr=$(echo "$changedCharts" | jq -r .[] | awk -F '/' '{ print $1"/"$2 }' | sort | uniq) - ) + charts=() + while IFS='' read -r line; do charts+=("$line"); done < <(echo "$chartStr") else - charts=($(find "$projectRootPath/charts" -type d -mindepth 1 -maxdepth 1 | sed "s~$projectRootPath/~~")) + chartStr=$(find "$projectRootPath/charts" -type d -mindepth 1 -maxdepth 1 | sed "s~$projectRootPath/~~") + charts=() + while IFS='' read -r line; do charts+=("$line"); done < <(echo "$chartStr") fi index=0 chartsJsonArray=() matrixJsonArray=() for chartPath in "${charts[@]}"; do - chartName=$(basename $chartPath) + chartName=$(basename "$chartPath") settings=$(yq -o=json '.' "$projectRootPath/$chartPath/ci.yaml") chartJson=$( jq --null-input \ @@ -29,7 +32,10 @@ for chartPath in "${charts[@]}"; do '{"name": $name, "path": $path, "settings": $settings}' ) chartsJsonArray+=("$chartJson") - versions=($(echo "$settings" | jq -r -c '.kubernetes.supportedVersions[]')) + versions=() + versionsStr=$(echo "$settings" | jq -r -c '.kubernetes.supportedVersions[]') + while IFS='' read -r line; do versions+=("$line"); done < <(echo "$versionsStr") + for version in "${versions[@]}"; do matrixJson=$( jq --null-input \ diff --git a/.github/scripts/install-custom-resource-definitions-test.sh b/.github/scripts/install-custom-resource-definitions-test.sh index dd4c32bb..8b4a57fe 100755 --- a/.github/scripts/install-custom-resource-definitions-test.sh +++ b/.github/scripts/install-custom-resource-definitions-test.sh @@ -1,6 +1,11 @@ #!/usr/bin/env bash -index=3 +index=1 +configuration=$(jq -c . = $minK8sVersion) [${#supportedVersions[@]}]:\n${supportedVersions[*]}\n" yq -i "$outputYamlPath = (\"${supportedVersions[*]}\" | split(\" \"))" "$dir/$outputFile" done diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a6ba6600..31a37d30 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,9 +26,3 @@ repos: hooks: - id: yamllint args: [--config-file, .github/yamllint.yaml, --format, github, --strict] - - - repo: https://github.com/jumanjihouse/pre-commit-hooks - rev: 3.0.0 - hooks: - - id: shellcheck - - id: shfmt