2
0
Эх сурвалжийг харах

feat(1.107): improvements (#2631)

Baptiste Augrain 1 долоо хоног өмнө
parent
commit
a80048c451

+ 0 - 6
build/linux/package_reh.sh

@@ -24,14 +24,8 @@ export VSCODE_NODEJS_URLROOT='/download/release'
 export VSCODE_NODEJS_URLSUFFIX=''
 export VSCODE_NODEJS_URLSUFFIX=''
 
 
 if [[ "${VSCODE_ARCH}" == "x64" ]]; then
 if [[ "${VSCODE_ARCH}" == "x64" ]]; then
-  GLIBC_VERSION="2.17"
-  GLIBCXX_VERSION="3.4.30"
-
   VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-x64"
   VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-x64"
 
 
-  export VSCODE_NODEJS_SITE='https://unofficial-builds.nodejs.org'
-  export VSCODE_NODEJS_URLSUFFIX='-glibc-217'
-
   export VSCODE_SKIP_SETUPENV=1
   export VSCODE_SKIP_SETUPENV=1
 elif [[ "${VSCODE_ARCH}" == "arm64" ]]; then
 elif [[ "${VSCODE_ARCH}" == "arm64" ]]; then
   EXPECTED_GLIBC_VERSION="2.30"
   EXPECTED_GLIBC_VERSION="2.30"

+ 10 - 6
update_version.sh

@@ -169,14 +169,18 @@ elif [[ "${OS_NAME}" == "windows" ]]; then
 
 
   if [[ "${VSCODE_ARCH}" == "ia32" || "${VSCODE_ARCH}" == "x64" ]]; then
   if [[ "${VSCODE_ARCH}" == "ia32" || "${VSCODE_ARCH}" == "x64" ]]; then
     # msi
     # msi
-    ASSET_NAME="${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi"
-    VERSION_PATH="${VSCODE_QUALITY}/win32/${VSCODE_ARCH}/msi"
-    updateLatestVersion
+    if [[ "${SHOULD_BUILD_MSI}" != "no" ]]; then
+      ASSET_NAME="${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi"
+      VERSION_PATH="${VSCODE_QUALITY}/win32/${VSCODE_ARCH}/msi"
+      updateLatestVersion
+    fi
 
 
     # updates-disabled msi
     # updates-disabled msi
-    ASSET_NAME="${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi"
-    VERSION_PATH="${VSCODE_QUALITY}/win32/${VSCODE_ARCH}/msi-updates-disabled"
-    updateLatestVersion
+    if [[ "${SHOULD_BUILD_MSI_NOUP}" != "no" ]]; then
+      ASSET_NAME="${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi"
+      VERSION_PATH="${VSCODE_QUALITY}/win32/${VSCODE_ARCH}/msi-updates-disabled"
+      updateLatestVersion
+    fi
   fi
   fi
 else # linux
 else # linux
   # update service links to tar.gz file
   # update service links to tar.gz file