Fixed up automatic changelog generation.

streamingfast · Sep 28, 2022 · 1f2f62a · 1f2f62a
1 parent 538600b
commit 1f2f62a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 15 deletions.
diff --git a/.github/generate_change_log.sh b/.github/generate_change_log.sh
@@ -1,9 +1,11 @@
 #!/usr/bin/env bash
 
-
 main() {
+  version="$1"
+  binaries_dir="$2"
+
   change_log_file="./CHANGELOG.md"
-  version="## $@"
+  version=`printf "## $version" | tr -d 'v'`
   version_prefix="## [0-9]{1,2}\."
   start=0
   CHANGE_LOG=""
@@ -19,15 +21,16 @@ main() {
       CHANGE_LOG+="$line\n"
     fi
   done < ${change_log_file}
-  LINUX_X86_64_BIN_SUM="$(checksum ./linux-x86_64-unknown-linux-gnu)"
+
+  LINUX_X86_64_BIN_SUM="$(checksum "$binaries_dir/thegarii-x86_64-unknown-linux-gnu")"
 
   OUTPUT="$(cat <<-END
 ## Changelog
 ${CHANGE_LOG}
 ## Checksums
 |Assets | Checksum (sha256)|
 |-|-|
-|thegarii-linux-x86-64 | ${LINUX_X86_64_BIN_SUM}|
+|thegarii-x86_64-unknown-linux-gnu | ${LINUX_X86_64_BIN_SUM}|
 END
 )"
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -93,17 +93,6 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v2
 
-      - name: Generate Change Log
-        id: changelog
-        if: ${{ startsWith(github.ref, 'refs/tags/') }}
-        run: |
-          chmod 755 ./.github/generate_change_log.sh
-          CHANGELOG=$(./.github/generate_change_log.sh ${{ env.RELEASE_VERSION }})
-
-          echo "CHANGELOG<<EOF" >> $GITHUB_ENV
-          echo "$CHANGELOG" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-
       - name: Download All Artifacts
         id: download-artifacts
         uses: actions/download-artifact@v2
@@ -130,6 +119,17 @@ jobs:
           chmod +x "${download_path}/linux-x86_64-unknown-linux-gnu/thegarii"
           mv "$download_path/linux-x86_64-unknown-linux-gnu/thegarii" "$download_path/thegarii-x86_64-unknown-linux-gnu"
 
+      - name: Generate Change Log
+        id: changelog
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        run: |
+          chmod 755 ./.github/generate_change_log.sh
+          CHANGELOG=$(./.github/generate_change_log.sh "${{ env.RELEASE_VERSION }}" "${{steps.download-artifacts.outputs.download-path}}")
+
+          echo "CHANGELOG<<EOF" >> $GITHUB_ENV
+          echo "$CHANGELOG" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
       - name: Log in to the Container registry
         uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.1
+
+- Fixed up automatic changelog generation.
+
 ## 0.2.0
 
 - Re-branded under Firehose (remove all usage of `deep mind`, `DMLOG` and other similar names).