DEVPROD-5132: Make tags unique

.yarnrc

@@ -0,0 +1,2 @@
+version-tag-prefix spruce/v
+version-git-message "spruce/v%s"

scripts/deploy/utils/git/tag/tag-utils.ts

@@ -1,5 +1,4 @@
 import { execSync } from "child_process";
-import { githubRemote } from "./constants";
 import { green, underline } from "../../../../utils/colors";
 
 /**
@@ -49,7 +48,7 @@ const getLatestTag = () => {
  */
 const deleteTag = (tag: string) => {
   console.log(`Deleting tag (${tag}) from remote...`);
-  const deleteCommand = `git push --delete ${githubRemote} ${tag}`;
+  const deleteCommand = `git push --delete upstream ${tag}`;
   try {
     execSync(deleteCommand, { stdio: "inherit", encoding: "utf-8" });
   } catch (err) {
@@ -63,7 +62,7 @@ const deleteTag = (tag: string) => {
 const pushTags = () => {
   console.log("Pushing tags...");
   try {
-    execSync(`git push --tags ${githubRemote}`, {
+    execSync(`git push --tags upstream`, {
       stdio: "inherit",
       encoding: "utf-8",
     });

scripts/push-version.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 WAIT_TIME=9
-GITHUB_REMOTE=https://github.com/evergreen-ci/spruce
+GIT_DESTINATION=$(git rev-parse --abbrev-ref @{upstream})
 
-if git push $GITHUB_REMOTE
+if git push upstream
 then
-  echo "Successfully pushed to ${GITHUB_REMOTE}"
+  echo "Successfully pushed to ${GIT_DESTINATION}"
 else
-  echo "Failed to push to ${GITHUB_REMOTE}"
+  echo "Failed to push to ${GIT_DESTINATION}"
   exit 1
 fi
 
@@ -17,11 +17,11 @@ while [ $i -gt 0 ]
 done
 echo ""
 
-if git push --tags $GITHUB_REMOTE
+if git push --tags upstream
 then
-  echo "Successfully pushed tags to ${GITHUB_REMOTE}"
+  echo "Successfully pushed tags to ${GIT_DESTINATION}"
 else 
-  echo "Failed to push tags to ${GITHUB_REMOTE}"
+  echo "Failed to push tags to ${GIT_DESTINATION}"
   exit 1
 fi
 

src/gql/generated/types.ts

@@ -2910,6 +2910,7 @@ export type User = {
   __typename?: "User";
   displayName: Scalars["String"]["output"];
   emailAddress: Scalars["String"]["output"];
+  parsleyFilters: Array<ParsleyFilter>;
   patches: Patches;
   permissions: Permissions;
   subscriptions?: Maybe<Array<GeneralSubscription>>;