1.85.1 rebase

Alex313031 · Jan 10, 2024 · 6f29ce2 · 6f29ce2
1 parent 346eafb
commit 6f29ce2
Show file tree

Hide file tree

Showing 2 changed files with 296 additions and 224 deletions.
diff --git a/get_repo.sh b/get_repo.sh
@@ -21,16 +21,16 @@ if [[ -z "${RELEASE_VERSION}" ]]; then
   if [[ "${VSCODE_LATEST}" == "yes" ]] || [[ ! -f "${VSCODE_QUALITY}.json" ]]; then
     UPDATE_INFO=$( curl --silent --fail "https://update.code.visualstudio.com/api/update/win32/${VSCODE_QUALITY}/0000000000000000000000000000000000000000" )
   else
-    MS_COMMIT="1a5daa3a0231a0fbba4f14db7ec463cf99d7768e"
-    MS_TAG="1.84.2"
+    MS_COMMIT="0ee08df0cf4527e40edc9aa28f4b5bd38bbff2b2"
+    MS_TAG="1.85.1"
   fi
 
   if [[ -z "${MS_COMMIT}" ]]; then
-    MS_COMMIT="1a5daa3a0231a0fbba4f14db7ec463cf99d7768e"
-    MS_TAG="1.84.2"
+    MS_COMMIT="0ee08df0cf4527e40edc9aa28f4b5bd38bbff2b2"
+    MS_TAG="1.85.1"
 
     if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
-      MS_TAG="1.84.2"
+      MS_TAG="1.85.1"
     fi
   fi
 
@@ -45,23 +45,23 @@ else
   if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
     if [[ "${RELEASE_VERSION}" =~ ^([0-9]+\.[0-9]+\.[0-9]+)\.[0-9]+-insider$ ]];
     then
-      MS_TAG="1.84.2"
+      MS_TAG="1.85.1"
     else
       echo "Error: Bad RELEASE_VERSION: ${RELEASE_VERSION}"
       exit 1
     fi
   else
     if [[ "${RELEASE_VERSION}" =~ ^([0-9]+\.[0-9]+\.[0-9]+)\.[0-9]+$ ]];
     then
-      MS_TAG="1.84.2"
+      MS_TAG="1.85.1"
     else
       echo "Error: Bad RELEASE_VERSION: ${RELEASE_VERSION}"
       exit 1
     fi
   fi
 
   if [[ "${MS_TAG}" == "$( jq -r '.tag' "${VSCODE_QUALITY}".json )" ]]; then
-    MS_COMMIT="1a5daa3a0231a0fbba4f14db7ec463cf99d7768e"
+    MS_COMMIT="0ee08df0cf4527e40edc9aa28f4b5bd38bbff2b2"
   else
     echo "Error: No MS_COMMIT for ${RELEASE_VERSION}"
     exit 1
@@ -79,17 +79,17 @@ git remote add origin https://github.com/Microsoft/vscode.git
 # figure out latest tag by calling MS update API
 if [[ -z "${MS_TAG}" ]]; then
   UPDATE_INFO=$( curl --silent --fail "https://update.code.visualstudio.com/api/update/win32/${VSCODE_QUALITY}/0000000000000000000000000000000000000000" )
-  MS_COMMIT="1a5daa3a0231a0fbba4f14db7ec463cf99d7768e"
-  MS_TAG="1.84.2"
+  MS_COMMIT="0ee08df0cf4527e40edc9aa28f4b5bd38bbff2b2"
+  MS_TAG="1.85.1"
 elif [[ -z "${MS_COMMIT}" ]]; then
   REFERENCE=$( git ls-remote --tags | grep -x ".*refs\/tags\/${MS_TAG}" | head -1 )
 
   if [[ -z "${REFERENCE}" ]]; then
     echo "Error: The following tag can't be found: ${MS_TAG}"
     exit 1
   elif [[ "${REFERENCE}" =~ ^([[:alnum:]]+)[[:space:]]+refs\/tags\/([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then
-    MS_COMMIT="1a5daa3a0231a0fbba4f14db7ec463cf99d7768e"
-    MS_TAG="1.84.2"
+    MS_COMMIT="0ee08df0cf4527e40edc9aa28f4b5bd38bbff2b2"
+    MS_TAG="1.85.1"
   else
     echo "Error: The following reference can't be parsed: ${REFERENCE}"
     exit 1