From 94efdd9f544021c5301cc323174584ac247ad1eb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 6 Sep 2022 12:10:31 +0100
Subject: [PATCH] Simplify releases: consolidate scripts (#23145)

* Remove stale comment re dependency

* Move npm publishing from release.sh to GHA

* Consolidate release subproject upgrade management

* Update release_config.yaml
---
 release.sh          | 63 ++-------------------------------------------
 release_config.yaml |  2 ++
 2 files changed, 4 insertions(+), 61 deletions(-)

diff --git a/release.sh b/release.sh
index 77876972f4..0969ad7ce9 100755
--- a/release.sh
+++ b/release.sh
@@ -1,68 +1,9 @@
 #!/bin/bash
 #
 # Script to perform a release of element-web.
-#
-# Requires github-changelog-generator; to install, do
-#   pip install git+https://github.com/matrix-org/github-changelog-generator.git
 
 set -e
 
-orig_args=$@
+cd "$(dirname "$0")"
 
-# chomp any args starting with '-' as these need to go
-# through to the release script and otherwise we'll get
-# confused about what the version arg is.
-while [[ "$1" == -* ]]; do
-    shift
-done
-
-cd `dirname $0`
-
-for i in matrix-js-sdk matrix-react-sdk
-do
-    echo "Checking version of $i..."
-    depver=`cat package.json | jq -r .dependencies[\"$i\"]`
-    latestver=`yarn info -s $i dist-tags.next`
-    if [ "$depver" != "$latestver" ]
-    then
-        echo "The latest version of $i is $latestver but package.json depends on $depver."
-        echo -n "Type 'u' to auto-upgrade, 'c' to continue anyway, or 'a' to abort:"
-        read resp
-        if [ "$resp" != "u" ] && [ "$resp" != "c" ]
-        then
-            echo "Aborting."
-            exit 1
-        fi
-        if [ "$resp" == "u" ]
-        then
-            echo "Upgrading $i to $latestver..."
-            yarn add -E $i@$latestver
-            git add -u
-            git commit -m "Upgrade $i to $latestver"
-        fi
-    fi
-done
-
-./node_modules/matrix-js-sdk/release.sh -n "$orig_args"
-
-release="${1#v}"
-tag="v${release}"
-prerelease=0
-# We check if this build is a prerelease by looking to
-# see if the version has a hyphen in it. Crude,
-# but semver doesn't support postreleases so anything
-# with a hyphen is a prerelease.
-echo $release | grep -q '-' && prerelease=1
-
-if [ $prerelease -eq 0 ]
-then
-    # For a release, reset SDK deps back to the `develop` branch.
-    for i in matrix-js-sdk matrix-react-sdk
-    do
-        echo "Resetting $i to develop branch..."
-        yarn add github:matrix-org/$i#develop
-        git add -u
-        git commit -m "Reset $i back to develop branch"
-    done
-    git push origin develop
-fi
+./node_modules/matrix-js-sdk/release.sh "$@"
diff --git a/release_config.yaml b/release_config.yaml
index 4d207a32d8..514dc31919 100644
--- a/release_config.yaml
+++ b/release_config.yaml
@@ -2,3 +2,5 @@ signing_id: releases@riot.im
 subprojects:
     matrix-react-sdk:
         includeByDefault: true
+    matrix-js-sdk:
+        includeByDefault: false