From 5c38cd6fb3268b03b1267bfe9dfef23a0a8b6d22 Mon Sep 17 00:00:00 2001
From: Louise Poole <louise@datarevenue.com>
Date: Thu, 17 Oct 2024 19:27:06 +0200
Subject: [PATCH] feat: improve substream release script

Improvements include:
- exit the script if any non-recoverable step fails
- fix bug where cargo version was hardcoded to be detected in balancer package
- allow optional input of substream config file. This is necessary for protocols with forks as they will have multiple configs in one directory
---
 .github/workflows/substream.cd.yaml |  6 +++++-
 substreams/release.sh               | 15 ++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/substream.cd.yaml b/.github/workflows/substream.cd.yaml
index 8e99d96..cafe987 100644
--- a/.github/workflows/substream.cd.yaml
+++ b/.github/workflows/substream.cd.yaml
@@ -9,6 +9,10 @@ on:
       package:
         required: true
         description: "Package to build"
+      config_file:
+        required: false
+        description: "Path to the substreams configuration file"
+        default: "substreams.yaml"
 
 jobs:
   Release:
@@ -42,4 +46,4 @@ jobs:
       - name: Run checks
         run: |
           cd substreams
-          ./release.sh ${{ inputs.package }}
+          ./release.sh ${{ inputs.package }} ${{ inputs.config_file }}
diff --git a/substreams/release.sh b/substreams/release.sh
index e011e95..7c55b91 100755
--- a/substreams/release.sh
+++ b/substreams/release.sh
@@ -16,7 +16,7 @@ if [ -n "$current_tag" ]; then
         # Semantic version
         version="${BASH_REMATCH[2]}"
 
-        cargo_version=$(cargo pkgid -p ethereum-balancer | cut -d# -f2 | cut -d: -f2)
+        cargo_version=$(cargo pkgid -p "$package" | cut -d# -f2 | cut -d: -f2)
         if [[ "$cargo_version" != "$version" ]]; then
           echo "Error: Cargo version: ${cargo_version} does not match tag version: ${version}!"
           exit 1
@@ -52,9 +52,18 @@ fi
 REPOSITORY=${REPOSITORY:-"s3://repo.propellerheads/substreams"}
 repository_path="$REPOSITORY/$package/$package-$version.spkg"
 
+# Optional input for yaml file; defaults to substreams.yaml if not provided
+yaml_file=${2:-"substreams.yaml"}
+
+if [[ ! -f "$package/$yaml_file" ]]; then
+    echo "Error: manifest reader: unable to stat input file $yaml_file: file does not exist."
+    exit 1
+fi
+
+set -e  # Exit the script if any command fails
 cargo build --target wasm32-unknown-unknown --release -p "$package"
 mkdir -p ./target/spkg/
-substreams pack $package/substreams.yaml -o ./target/spkg/$package-$version.spkg
+substreams pack "$package/$yaml_file" -o ./target/spkg/$package-$version.spkg
 aws s3 cp ./target/spkg/$package-$version.spkg $repository_path
 
-echo "Released substreams package: '$repository_path'"
\ No newline at end of file
+echo "Released substreams package: '$repository_path'"