diff --git a/.github/scripts/gen-docs.sh b/.github/scripts/gen-docs.sh index 4a43cc8ceec..485e1061fc9 100755 --- a/.github/scripts/gen-docs.sh +++ b/.github/scripts/gen-docs.sh @@ -33,30 +33,27 @@ sync_tag() { echo "Updating home of ${chartname}..." sed -i -e "s|home: .*|home: https:\/\/truecharts.org\/docs\/charts\/${train}\/${chartname}|" "${chart}/Chart.yaml" echo "Attempting to update sources of ${chartname}..." - # Only update source if go-yq is installed - if [ $(command -v go-yq) ]; then - go-yq -V - # Get all sources (except truecharts) - curr_sources=$(go-yq '.sources[] | select(. != "https://github.com/truecharts*")' "${chart}/Chart.yaml") - echo "${chartname}: $curr_sources" - echo "${chartname}: After getting all sources" - cat "${chart}/Chart.yaml" - # Empty sources list in-place - go-yq -i 'del(.sources.[])' "${chart}/Chart.yaml" - echo "${chartname}: After deleting all sources" - cat "${chart}/Chart.yaml" - # Add truechart source - tcsource="https://github.com/truecharts/charts/tree/master/charts/$train/$chartname" go-yq -i '.sources += env(tcsource)' "${chart}/Chart.yaml" - echo "${chartname}: After adding tc source" - cat "${chart}/Chart.yaml" - # Add the rest of the sources - while IFS= read -r line; do - src="$line" go-yq -i '.sources += env(src)' "${chart}/Chart.yaml" - done <<< "$curr_sources" - echo "${chartname}: After adding the rest of the sources" - cat "${chart}/Chart.yaml" - echo "Sources of ${chartname} updated!" - fi; + go-yq -V + # Get all sources (except truecharts) + curr_sources=$(go-yq '.sources[] | select(. != "https://github.com/truecharts*")' "${chart}/Chart.yaml") + echo "${chartname}: $curr_sources" + echo "${chartname}: After getting all sources" + cat "${chart}/Chart.yaml" + # Empty sources list in-place + go-yq -i 'del(.sources.[])' "${chart}/Chart.yaml" + echo "${chartname}: After deleting all sources" + cat "${chart}/Chart.yaml" + # Add truechart source + tcsource="https://github.com/truecharts/charts/tree/master/charts/$train/$chartname" go-yq -i '.sources += env(tcsource)' "${chart}/Chart.yaml" + echo "${chartname}: After adding tc source" + cat "${chart}/Chart.yaml" + # Add the rest of the sources + while IFS= read -r line; do + src="$line" go-yq -i '.sources += env(src)' "${chart}/Chart.yaml" + done <<< "$curr_sources" + echo "${chartname}: After adding the rest of the sources" + cat "${chart}/Chart.yaml" + echo "Sources of ${chartname} updated!" } export -f sync_tag diff --git a/.github/workflows/catalog-test.yaml b/.github/workflows/catalog-test.yaml index 1a1437f5780..39b5515f41a 100644 --- a/.github/workflows/catalog-test.yaml +++ b/.github/workflows/catalog-test.yaml @@ -15,7 +15,7 @@ jobs: name: Test SCALE Catalog runs-on: ubuntu-latest container: - image: ghcr.io/truecharts/devcontainer:v2.6.0@sha256:395ee7ed8b9cba6569ddeba77b7ceb86fdb79b91a19c639625d7bc54cb1ccc1d + image: ghcr.io/truecharts/devcontainer:v2.6.0@sha256:992e3c1df7245846a4d8f30fb0f21dc259d245ff41b3a1901284bdb26f4cb4cd steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 name: Checkout diff --git a/.github/workflows/charts-release.yaml b/.github/workflows/charts-release.yaml index f85097d9b4f..507bc40b960 100644 --- a/.github/workflows/charts-release.yaml +++ b/.github/workflows/charts-release.yaml @@ -14,7 +14,7 @@ jobs: release: runs-on: ubuntu-latest container: - image: ghcr.io/truecharts/devcontainer:v2.6.0@sha256:395ee7ed8b9cba6569ddeba77b7ceb86fdb79b91a19c639625d7bc54cb1ccc1d + image: ghcr.io/truecharts/devcontainer:v2.6.0@sha256:992e3c1df7245846a4d8f30fb0f21dc259d245ff41b3a1901284bdb26f4cb4cd concurrency: gitpush steps: - name: Install Kubernetes tools diff --git a/tools/build-release.sh b/tools/build-release.sh index 4bc6d925532..4f0fb4eba60 100755 --- a/tools/build-release.sh +++ b/tools/build-release.sh @@ -302,30 +302,27 @@ sync_tag() { echo "Updating home of ${chartname}..." sed -i -e "s|home: .*|home: https:\/\/truecharts.org\/docs\/charts\/${train}\/${chartname}|" "${chart}/Chart.yaml" echo "Attempting to update sources of ${chartname}..." - # Only update source if go-yq is installed - if [ $(command -v go-yq) ]; then - go-yq -V - # Get all sources (except truecharts) - curr_sources=$(go-yq '.sources[] | select(. != "https://github.com/truecharts*")' "${chart}/Chart.yaml") - echo "${chartname}: $curr_sources" - echo "${chartname}: After getting all sources" - cat "${chart}/Chart.yaml" - # Empty sources list in-place - go-yq -i 'del(.sources.[])' "${chart}/Chart.yaml" - echo "${chartname}: After deleting all sources" - cat "${chart}/Chart.yaml" - # Add truechart source - tcsource="https://github.com/truecharts/charts/tree/master/charts/$train/$chartname" go-yq -i '.sources += env(tcsource)' "${chart}/Chart.yaml" - echo "${chartname}: After adding tc source" - cat "${chart}/Chart.yaml" - # Add the rest of the sources - while IFS= read -r line; do - src="$line" go-yq -i '.sources += env(src)' "${chart}/Chart.yaml" - done <<< "$curr_sources" - echo "${chartname}: After adding the rest of the sources" - cat "${chart}/Chart.yaml" - echo "Sources of ${chartname} updated!" - fi; + go-yq -V + # Get all sources (except truecharts) + curr_sources=$(go-yq '.sources[] | select(. != "https://github.com/truecharts*")' "${chart}/Chart.yaml") + echo "${chartname}: $curr_sources" + echo "${chartname}: After getting all sources" + cat "${chart}/Chart.yaml" + # Empty sources list in-place + go-yq -i 'del(.sources.[])' "${chart}/Chart.yaml" + echo "${chartname}: After deleting all sources" + cat "${chart}/Chart.yaml" + # Add truechart source + tcsource="https://github.com/truecharts/charts/tree/master/charts/$train/$chartname" go-yq -i '.sources += env(tcsource)' "${chart}/Chart.yaml" + echo "${chartname}: After adding tc source" + cat "${chart}/Chart.yaml" + # Add the rest of the sources + while IFS= read -r line; do + src="$line" go-yq -i '.sources += env(src)' "${chart}/Chart.yaml" + done <<< "$curr_sources" + echo "${chartname}: After adding the rest of the sources" + cat "${chart}/Chart.yaml" + echo "Sources of ${chartname} updated!" } export -f sync_tag