Revise release workflow (#6634)

NethermindEth · Feb 16, 2024 · 73aaee0 · 73aaee0
1 parent d128f58
commit 73aaee0
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 37 deletions.
diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml
@@ -16,8 +16,6 @@ jobs:
           ref: ${{ github.event.release.tag_name }}
       - name: Set up .NET
         uses: actions/setup-dotnet@v4
-      - name: Wait to ensure assets are uploaded
-        run: sleep 5m
       - name: Download Nethermind reference assemblies
         run: |
           json=$(curl -s ${{ github.event.release.assets_url }})

diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml
@@ -5,18 +5,10 @@ on:
     types: [published]
 
 jobs:
-  wait:
-    name: Wait for assets
-    runs-on: ubuntu-latest
-    if: ${{ !github.event.release.prerelease }}
-    steps:
-      - name: Wait to ensure assets are uploaded
-        run: sleep 5m
-
   publish-ppa:
     name: Publish on PPA
     runs-on: ubuntu-latest
-    needs: wait
+    if: ${{ !github.event.release.prerelease }}
     steps:
       - name: Check out Nethermind repository
         uses: actions/checkout@v4
@@ -90,7 +82,7 @@ jobs:
   publish-winget:
     name: Publish on Windows Package Manager
     runs-on: windows-latest
-    needs: wait
+    if: ${{ !github.event.release.prerelease }}
     steps:
       - name: Submit package
         run: |
@@ -102,7 +94,7 @@ jobs:
   publish-homebrew:
     name: Publish on Homebrew
     runs-on: ubuntu-latest
-    needs: wait
+    if: ${{ !github.event.release.prerelease }}
     env:
       FORMULA: nethermind.rb
     steps:

diff --git a/scripts/deployment/build-cli.sh b/scripts/deployment/build-cli.sh
@@ -10,8 +10,7 @@ cd $GITHUB_WORKSPACE/src/Nethermind/Nethermind.Cli
 
 echo "Building Nethermind CLI"
 
-for rid in "linux-x64" "linux-arm64" "win-x64" "osx-x64" "osx-arm64"
-do
+for rid in "linux-x64" "linux-arm64" "win-x64" "osx-x64" "osx-arm64"; do
   echo "  Publishing for $rid"
 
   dotnet publish -c release -r $rid -o $output_path/$rid --sc true \

diff --git a/scripts/deployment/build-runner.sh b/scripts/deployment/build-runner.sh
@@ -11,8 +11,7 @@ cd $GITHUB_WORKSPACE/src/Nethermind/Nethermind.Runner
 
 echo "Building Nethermind"
 
-for rid in "linux-x64" "linux-arm64" "win-x64" "osx-x64" "osx-arm64"
-do
+for rid in "linux-x64" "linux-arm64" "win-x64" "osx-x64" "osx-arm64"; do
   echo "  Publishing for $rid"
 
   dotnet publish -c $build_config -r $rid -o $output_path/$rid --sc true \

diff --git a/scripts/deployment/publish-downloads.sh b/scripts/deployment/publish-downloads.sh
@@ -10,8 +10,7 @@ echo "Publishing packages to Downloads page"
 
 cd $GITHUB_WORKSPACE/$PACKAGE_DIR
 
-for rid in "linux-x64" "linux-arm64" "windows-x64" "macos-x64" "macos-arm64"
-do
+for rid in "linux-x64" "linux-arm64" "windows-x64" "macos-x64" "macos-arm64"; do
   file_name=$(basename *$rid*)
 
   echo "Signing $file_name"

diff --git a/scripts/deployment/publish-github.sh b/scripts/deployment/publish-github.sh
@@ -11,8 +11,9 @@ release_id=$(curl https://api.github.com/repos/$GITHUB_REPOSITORY/releases \
   -H "Accept: application/vnd.github+json" \
   -H "Authorization: Bearer $GITHUB_TOKEN" | jq -r '.[] | select(.tag_name == "'$GIT_TAG'") | .id')
 
-if [ "$release_id" == "" ]
-then
+should_publish=true
+
+if [ "$release_id" == "" ]; then
   echo "Drafting release $GIT_TAG"
 
   body=$(printf \
@@ -25,27 +26,13 @@ then
     -H "Accept: application/vnd.github+json" \
     -H "Authorization: Bearer $GITHUB_TOKEN" \
     -d "$body" | jq -r '.id')
-else
-  echo "Publishing release $GIT_TAG"
-
-  make_latest=$([ $PRERELEASE = 'true' ] && echo "false" || echo "true")
-
-  body=$(printf \
-    '{"target_commitish": "%s", "name": "v%s", "draft": false, "make_latest": "%s", "prerelease": %s}' \
-    $GITHUB_SHA $GIT_TAG $make_latest $PRERELEASE)
 
-  curl https://api.github.com/repos/$GITHUB_REPOSITORY/releases/$release_id \
-    -X PATCH \
-    --fail-with-body \
-    -H "Accept: application/vnd.github+json" \
-    -H "Authorization: Bearer $GITHUB_TOKEN" \
-    -d "$body"
+  should_publish=false
 fi
 
 cd $GITHUB_WORKSPACE/$PACKAGE_DIR
 
-for rid in "linux-x64" "linux-arm64" "windows-x64" "macos-x64" "macos-arm64" "ref-assemblies"
-do
+for rid in "linux-x64" "linux-arm64" "windows-x64" "macos-x64" "macos-arm64" "ref-assemblies"; do
   file_name=$(basename *$rid*)
 
   echo "Uploading $file_name"
@@ -59,4 +46,21 @@ do
     --data-binary @"$file_name"
 done
 
+if [ "$should_publish" == "true" ]; then
+  echo "Publishing release $GIT_TAG"
+
+  make_latest=$([ $PRERELEASE = 'true' ] && echo "false" || echo "true")
+
+  body=$(printf \
+    '{"target_commitish": "%s", "name": "v%s", "draft": false, "make_latest": "%s", "prerelease": %s}' \
+    $GITHUB_SHA $GIT_TAG $make_latest $PRERELEASE)
+
+  curl https://api.github.com/repos/$GITHUB_REPOSITORY/releases/$release_id \
+    -X PATCH \
+    --fail-with-body \
+    -H "Accept: application/vnd.github+json" \
+    -H "Authorization: Bearer $GITHUB_TOKEN" \
+    -d "$body"
+fi
+
 echo "Publishing completed"