From 68e1ba360f2ab1f6dfb71317460ec881bf5a491f Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 7 Feb 2022 18:11:02 +0100
Subject: [PATCH] workflows: move upgrade helper dispatch to release manifest
 workflow

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .github/workflows/sync_release-manifest.yml | 28 +++++++++++++++++++++
 scripts/create-release-tag.js               | 12 ---------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/sync_release-manifest.yml b/.github/workflows/sync_release-manifest.yml
index 39e270af16..85c01d0631 100644
--- a/.github/workflows/sync_release-manifest.yml
+++ b/.github/workflows/sync_release-manifest.yml
@@ -48,3 +48,31 @@ jobs:
           git add .
           git commit -am "${{ github.event.inputs.version }}"
           git push
+
+      - name: Dispatch update-helper update
+        uses: actions/github-script@v5
+        with:
+          github-token: ${{ secrets.GH_SERVICE_ACCOUNT_TOKEN }}
+          # TODO(Rugvip): Remove the create-app dispatch once we've been on the release version for a while
+          script: |
+            console.log('Dispatching upgrade helper sync - release version');
+            await octokit.actions.createWorkflowDispatch({
+              owner: 'backstage',
+              repo: 'upgrade-helper-diff',
+              workflow_id: 'release.yml',
+              ref: 'master',
+              inputs: {
+                version: require('./package.json').version,
+              },
+            });
+
+            console.log('Dispatching upgrade helper sync - create-app version');
+            await octokit.actions.createWorkflowDispatch({
+              owner: 'backstage',
+              repo: 'upgrade-helper-diff',
+              workflow_id: 'release.yml',
+              ref: 'master',
+              inputs: {
+                version: require('./packages/create-app/package.json').version,
+              },
+            });
diff --git a/scripts/create-release-tag.js b/scripts/create-release-tag.js
index f898705ce5..637467f285 100755
--- a/scripts/create-release-tag.js
+++ b/scripts/create-release-tag.js
@@ -68,18 +68,6 @@ async function dispatchReleaseWorkflows(octokit, releaseVersion) {
       version: releaseVersion,
     },
   });
-
-  console.log('Dispatching upgrade helper sync');
-  await octokit.actions.createWorkflowDispatch({
-    owner: 'backstage',
-    repo: 'upgrade-helper-diff',
-    workflow_id: 'release.yml',
-    ref: 'master',
-    inputs: {
-      // TODO(Rugvip): Switch this over to use the release version once it's ready
-      version: require('../packages/create-app/package.json').version,
-    },
-  });
 }
 
 async function main() {