Fix release notes generation (open-telemetry#4622)

trask · jack-berg · web-flow · commit 65ab38b2d642 · 2022-07-20T10:16:44.000-05:00
* Fix release notes generation

* Update .github/scripts/generate-release-contributors.sh

Co-authored-by: jack-berg &lt;34418638+jack-berg@users.noreply.github.com&gt;

Co-authored-by: jack-berg &lt;34418638+jack-berg@users.noreply.github.com&gt;
diff --git a/.github/scripts/generate-release-contributors.sh b/.github/scripts/generate-release-contributors.sh
@@ -5,6 +5,11 @@
 
 # this should be run on the release branch
 
+# NOTE if you need to run this script locally, you will need to first:
+#   git fetch upstream main
+#   git push origin upstream/main:main
+#   export GITHUB_REPOSITORY=open-telemetry/opentelemetry-java
+
 from_version=$1
 
 # get the date of the first commit that was not in the from_version
@@ -81,4 +86,5 @@ echo $contributors1 $contributors2 \
   | grep -v github-actions \
   | grep -v dependabot \
   | grep -v codecov \
+  | grep -v opentelemetrybot \
   | sed 's/^/@/'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,9 +13,6 @@ jobs:
           fi
 
       - uses: actions/checkout@v3
-        with:
-          # tags are needed for the generate-release-contributors.sh script
-          fetch-depth: 0
 
       - uses: actions/setup-java@v3
         with:
@@ -74,18 +71,16 @@ jobs:
 
         # back to the release branch
       - uses: actions/checkout@v3
+        with:
+          # tags are needed for the generate-release-contributors.sh script
+          fetch-depth: 0
 
       - name: Generate release notes
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           # conditional blocks not indented because of the heredoc
-          if [[ $VERSION == *.0 ]]; then
-          cat > /tmp/release-notes.txt << EOF
-          This release targets the OpenTelemetry SDK $VERSION.
-
-          EOF
-          else
+          if [[ $VERSION != *.0 ]]; then
           cat > /tmp/release-notes.txt << EOF
           This is a patch release on the previous $PRIOR_VERSION release, fixing the issue(s) below.
 
