diff --git a/.github/workflows/apps.release.yaml b/.github/workflows/apps.release.yaml index 764c7bf7f48..8006afe1861 100644 --- a/.github/workflows/apps.release.yaml +++ b/.github/workflows/apps.release.yaml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest concurrency: gitpush container: - image: ghcr.io/truecharts/truecharts-release:v1.2.0 + image: ghcr.io/truecharts/truecharts-release:v1.3.0 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/apps.test.yaml b/.github/workflows/apps.test.yaml index ebb765c1707..dc816492c16 100644 --- a/.github/workflows/apps.test.yaml +++ b/.github/workflows/apps.test.yaml @@ -196,7 +196,7 @@ jobs: release-test: runs-on: ubuntu-latest container: - image: ghcr.io/truecharts/truecharts-release:v1.2.0 + image: ghcr.io/truecharts/truecharts-release:v1.3.0 steps: - name: Cache helm repo cache id: cache diff --git a/tools/build-release.sh b/tools/build-release.sh index 5890ddddf86..3b5b1fd108b 100755 --- a/tools/build-release.sh +++ b/tools/build-release.sh @@ -122,20 +122,20 @@ sync_tag() { local chartname="$2" local train="$3" local chartversion="$4" - echo "Attempting to sync primary tag with Charts.yaml for: ${chartname}" + echo "Attempting to sync primary tag with appversion for: ${chartname}" local tag="$(cat ${chart}/Values.yaml | grep "^ tag: " | awk -F" " '{ print $2 }')" tag="${tag:-auto}" tag="${tag#*release-}" tag="${tag#*version-}" tag="${tag#*v}" + tag="${tag:0:10}" sed -i -e "s|appVersion: .*|appVersion: ${tag}|" "${chart}/Chart.yaml" } pre_commit() { if [[ -z "$standalone" ]]; then echo "Running pre-commit test-and-cleanup..." - # TO BE ENABLED - # pre-commit run --all ||: + pre-commit run --all ||: # Fix sh files to always be executable find . -name '*.sh' | xargs chmod +x fi