diff --git a/.ci/ct/ct.yaml b/.ci/ct/ct.yaml index 4491bcbd..cd44c2a3 100644 --- a/.ci/ct/ct.yaml +++ b/.ci/ct/ct.yaml @@ -13,7 +13,8 @@ chart-dirs: excluded-charts-lint: [] -excluded-charts-install: [] +excluded-charts-install: + - library/common chart-repos: - bitnami=https://charts.bitnami.com/bitnami diff --git a/.github/workflows/charts-test.yaml b/.github/workflows/charts-test.yaml index 997e160e..22a45bdf 100644 --- a/.github/workflows/charts-test.yaml +++ b/.github/workflows/charts-test.yaml @@ -35,16 +35,13 @@ jobs: fetch-depth: 0 ref: ${{ inputs.checkoutCommit }} - - name: Set up chart-testing - uses: helm/chart-testing-action@v2.2.1 - - name: Run chart-testing (list-changed) id: list-changed if: inputs.chartChanges != '' run: | - EXCLUDED=$(yq eval '.excluded-charts-install | join(",")' .ci/ct/ct.yaml) - CHARTS=$(ct list-changed --config .ci/ct/ct.yaml --excluded-charts "${EXCLUDED}") - OUTPUT_JSON=$(echo "${CHARTS}" | jq -R -s -c 'split("\n")[:-1]') + EXCLUDED=$(yq -o json eval '.excluded-charts-install' .ci/ct/ct.yaml) + CHARTS_JSON=$(echo "${{ inputs.chartChanges }}" | yq -o json eval 'split(" ")' -) + OUTPUT_JSON=$(yq --null-input "$CHARTS_JSON - $EXCLUDED | .. style= \"flow\"") echo ::set-output name=charts::${OUTPUT_JSON} if [[ $(echo ${OUTPUT_JSON} | jq -c '. | length') -gt 0 ]]; then echo "::set-output name=detected::true"