Merge pull request #1030 from twilio/FLEXY-5323-v6-test

FLEXY-5323 test for v6 with cheerio patch fix
twilio · Aug 16, 2024 · 9a19cfa · 9a19cfa
2 parents 362574a + d88ebd5
commit 9a19cfa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/manual_alpha_release_v6.yaml b/.github/workflows/manual_alpha_release_v6.yaml
@@ -15,10 +15,10 @@ on:
 jobs:
   release-public-version:
     if: github.ref == 'refs/heads/main'
-    uses: ./.github/workflows/~reusable_public_publish.yaml
+    uses: ./.github/workflows/~reusable_publish.yaml
     with:
       TAG: alpha
-      VERSION: 6.4.2
+      VERSION: patch
       BRANCH: FLEXY-5323-6.4.2
       ENVIRONMENT: alpha_release
     secrets:

diff --git a/.github/workflows/manual_public_release_v6.yaml b/.github/workflows/manual_public_release_v6.yaml
@@ -15,10 +15,10 @@ on:
 jobs:
   release-public-version:
     if: github.ref == 'refs/heads/main'
-    uses: ./.github/workflows/~reusable_public_publish.yaml
+    uses: ./.github/workflows/~reusable_publish.yaml
     with:
       TAG: public
-      VERSION: 6.4.2
+      VERSION: patch
       BRANCH: FLEXY-5323-6.4.2
       ENVIRONMENT: public_release
     secrets:

diff --git a/bin/publish b/bin/publish
@@ -10,8 +10,8 @@ function getJsonValue() {
 
 tag="${1}"
 bump="${2}"
-branch="${BRANCH}"
-currentVersion=$(cat ./lerna.json | getJsonValue 'version' |  cut -f1 -d"-")
+branch="FLEXY-5323-6.4.2"
+currentVersion="6.4.1"
 semver=( ${currentVersion//./ } )
 major="${semver[0]}"
 minor="${semver[1]}"
@@ -36,11 +36,11 @@ if [ "${bump}" != "patch" ] && [ "${bump}" != "minor" ] && [ "${bump}" != "major
   exit 1
 fi
 
-# Verify tag and branch
-if [ "${tag}" == "public" ] && [ "${branch}" != "main" ] ; then
-  echo "Public release must be done on the main branch"
-  exit 1
-fi
+# # Verify tag and branch
+# if [ "${tag}" == "public" ] && [ "${branch}" != "main" ] ; then
+#   echo "Public release must be done on the main branch"
+#   exit 1
+# fi
 if [ "${tag}" == "beta" ] && [[ ! "${branch}" =~ ^v.-beta$ ]] ; then
   echo "Beta release must be done on the v*-beta branch"
   exit 1