Merge branch 'main' into fix-selinix-label-mps

NVIDIA · Jul 31, 2024 · 15124ac · 15124ac
2 parents 8a3246d + e5804eb
commit 15124ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml
@@ -38,13 +38,10 @@ jobs:
         fetch-depth: 0
 
     - name: Update helm index
-      env:
-        VERSION: ${{ github.event.release.tag_name }}
-        DOWNLOAD_URL: ${{ join(github.event.release.assets.*.browser_download_url, ' ') }}
       run: |
         git config user.name "Github Actions"
         git config user.email "no-reply@github.com"
-        ./hack/update-helm-index.sh --helm-repo-path $HELM_REPO_PATH $DOWNLOAD_URL
+        ./hack/update-helm-index.sh --helm-repo-path $HELM_REPO_PATH --version ${{ github.event.release.tag_name }}
 
     - name: Push updated Helm charts and index to gh-pages branch
       run: |

diff --git a/hack/generate-changelog.sh b/hack/generate-changelog.sh
@@ -20,7 +20,7 @@ this=`basename $0`
 usage () {
 cat << EOF
 Generate a changelog for the specified tag
-Usage: $this --reference <tag> [--remote <remote_name>]
+Usage: $this --since <tag> [--remote <remote_name>]
 
 Options:
   --since     specify the tag to start the changelog from (default: latest tag)
@@ -70,10 +70,15 @@ if [ -z "$REFERENCE" ]; then
     fi
 fi
 
+SHA=$(git rev-parse ${VERSION})
+if [[ $? -ne 0 ]]; then
+    SHA="HEAD"
+fi
+
 # Print the changelog
 echo "## Changelog"
 echo ""
 echo "### Version $VERSION"
 
 # Iterate over the commit messages and ignore the ones that start with "Merge" or "Bump"
-git log --pretty=format:"%s" $REFERENCE..@ | grep -Ev "(^Merge )|(^Bump)|(no-rel-?note)|(^---)" |  sed 's/^\(.*\)/- \1/g'
+git log --pretty=format:"%s" $REFERENCE..$SHA | grep -Ev "(^Merge )|(^Bump)|(no-rel-?note)|(^---)" |  sed 's/^\(.*\)/- \1/g'