From e139c02cc793c74cb7caa86c0f78b64d4b22d9cc Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sun, 3 Apr 2022 10:43:00 +0200 Subject: [PATCH] try ci fix --- .github/scripts/gen-docs.sh | 42 ++++++++++++--------------- .github/workflows/charts-release.yaml | 4 ++- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/.github/scripts/gen-docs.sh b/.github/scripts/gen-docs.sh index d7e149a3675..9bb7666fa32 100755 --- a/.github/scripts/gen-docs.sh +++ b/.github/scripts/gen-docs.sh @@ -3,27 +3,6 @@ set -o errexit set -o nounset set -o pipefail -chart_runner(){ - if [[ -d "charts/${1}" ]]; then - echo "Start processing charts/${1} ..." - chartversion=$(cat charts/${1}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }') - chartname=$(basename charts/${1}) - train=$(basename $(dirname "charts/${1}")) - SCALESUPPORT=$(cat charts/${1}/Chart.yaml | yq '.annotations."truecharts.org/SCALE-support"' -r) - helm dependency update "charts/${1}" --skip-refresh || (sleep 10 && helm dependency update "charts/${1}" --skip-refresh) || (sleep 10 && helm dependency update "charts/${1}" --skip-refresh) - helm_sec_scan "charts/${1}" "${chartname}" "$train" "${chartversion}" || echo "helm-chart security-scan failed..." - container_sec_scan "charts/${1}" "${chartname}" "$train" "${chartversion}" || echo "container security-scan failed..." - sec_scan_cleanup "charts/${1}" "${chartname}" "$train" "${chartversion}" || echo "security-scan cleanup failed..." - sync_tag "charts/${1}" "${chartname}" "$train" "${chartversion}" || echo "Tag sync failed..." - create_changelog "charts/${1}" "${chartname}" "$train" "${chartversion}" || echo "changelog generation failed..." - generate_docs "charts/${1}" "${chartname}" "$train" "${chartversion}" || echo "Docs generation failed..." - else - echo "Chart 'charts/${1}' no longer exists in repo. Skipping it..." - fi - echo "Done processing charts/${1} ..." -} -export -f chart_runner - # Designed to ensure the appversion in Chart.yaml is in sync with the primary App tag if found sync_tag() { local chart="$1" @@ -152,6 +131,21 @@ generate_docs() { } export -f generate_docs -parthreads=$(($(nproc) * 2)) -parallel -j ${parthreads} chart_runner '2>&1' ::: ${1[@]} -echo "Starting post-processing" + +if [[ -d "charts/${1}" ]]; then + echo "Start processing charts/${1} ..." + chartversion=$(cat charts/${1}/Chart.yaml | grep "^version: " | awk -F" " '{ print $2 }') + chartname=$(basename charts/${1}) + train=$(basename $(dirname "charts/${1}")) + SCALESUPPORT=$(cat charts/${1}/Chart.yaml | yq '.annotations."truecharts.org/SCALE-support"' -r) + helm dependency update "charts/${1}" --skip-refresh || (sleep 10 && helm dependency update "charts/${1}" --skip-refresh) || (sleep 10 && helm dependency update "charts/${1}" --skip-refresh) + helm_sec_scan "charts/${1}" "${chartname}" "$train" "${chartversion}" || echo "helm-chart security-scan failed..." + container_sec_scan "charts/${1}" "${chartname}" "$train" "${chartversion}" || echo "container security-scan failed..." + sec_scan_cleanup "charts/${1}" "${chartname}" "$train" "${chartversion}" || echo "security-scan cleanup failed..." + sync_tag "charts/${1}" "${chartname}" "$train" "${chartversion}" || echo "Tag sync failed..." + create_changelog "charts/${1}" "${chartname}" "$train" "${chartversion}" || echo "changelog generation failed..." + generate_docs "charts/${1}" "${chartname}" "$train" "${chartversion}" || echo "Docs generation failed..." +else + echo "Chart 'charts/${1}' no longer exists in repo. Skipping it..." +fi +echo "Done processing charts/${1} ..." diff --git a/.github/workflows/charts-release.yaml b/.github/workflows/charts-release.yaml index 9be927b6559..47abe9d3889 100644 --- a/.github/workflows/charts-release.yaml +++ b/.github/workflows/charts-release.yaml @@ -57,7 +57,9 @@ jobs: steps.collect-changes.outputs.changesDetectedAfterTag == 'true' run: | CHARTS=(${{ steps.collect-changes.outputs.modifiedChartsAfterTag }}) - .github/scripts/gen-docs.sh ${CHARTS[@]} + parthreads=$(($(nproc) * 2)) + parallel -j ${parthreads} .github/scripts/gen-docs.sh ${CHARTS[@]} '2>&1' ::: ${1[@]} + - name: Fix Pre-Commit issues shell: bash