timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-19 13:46:03 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): use explicit urls (#2319)

Browse Source
This commit is contained in:
Baptiste Augrain
2025-04-09 12:31:57 +02:00
committed by GitHub
parent f9c35a6d6e
commit 32aec3155b
5 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/insider-linux.yml vendored
View File

@@ -217,8 +217,8 @@ jobs:
run: ./check_tags.sh run: ./check_tags.sh
if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
- name: Install libkrb5-dev - name: Install dependencies
run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev run: ./build/linux/deps.sh
if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
- uses: actions-rust-lang/setup-rust-toolchain@v1 - uses: actions-rust-lang/setup-rust-toolchain@v1

4
.github/workflows/stable-linux.yml vendored
View File

@@ -218,8 +218,8 @@ jobs:
run: ./check_tags.sh run: ./check_tags.sh
if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
- name: Install libkrb5-dev - name: Install dependencies
run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev run: ./build/linux/deps.sh
if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes' if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
- uses: actions-rust-lang/setup-rust-toolchain@v1 - uses: actions-rust-lang/setup-rust-toolchain@v1

13
build/linux/deps.sh Executable file
View File

@@ -0,0 +1,13 @@
#!/usr/bin/env bash
set -ex
sudo apt-get update -y
sudo apt-get install -y libkrb5-dev
if [[ "${VSCODE_ARCH}" == "arm64" ]]; then
sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu crossbuild-essential-arm64
elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then
sudo apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf crossbuild-essential-armhf
fi

11
build_cli.sh
View File

@@ -7,6 +7,13 @@ cd cli
export CARGO_NET_GIT_FETCH_WITH_CLI="true" export CARGO_NET_GIT_FETCH_WITH_CLI="true"
export VSCODE_CLI_APP_NAME="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )" export VSCODE_CLI_APP_NAME="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"
export VSCODE_CLI_BINARY_NAME="$( node -p "require(\"../product.json\").serverApplicationName" )" export VSCODE_CLI_BINARY_NAME="$( node -p "require(\"../product.json\").serverApplicationName" )"
export VSCODE_CLI_UPDATE_ENDPOINT="https://raw.githubusercontent.com/VSCodium/versions/refs/heads/master"
if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
export VSCODE_CLI_DOWNLOAD_ENDPOINT="https://github.com/VSCodium/vscodium-insiders/releases"
else
export VSCODE_CLI_DOWNLOAD_ENDPOINT="https://github.com/VSCodium/vscodium/releases"
fi
TUNNEL_APPLICATION_NAME="$( node -p "require(\"../product.json\").tunnelApplicationName" )" TUNNEL_APPLICATION_NAME="$( node -p "require(\"../product.json\").tunnelApplicationName" )"
NAME_SHORT="$( node -p "require(\"../product.json\").nameShort" )" NAME_SHORT="$( node -p "require(\"../product.json\").nameShort" )"
@@ -58,8 +65,6 @@ else
export CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc export CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc
export CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ export CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++
export PKG_CONFIG_ALLOW_CROSS=1 export PKG_CONFIG_ALLOW_CROSS=1
sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu crossbuild-essential-arm64
elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then
VSCODE_CLI_TARGET="armv7-unknown-linux-gnueabihf" VSCODE_CLI_TARGET="armv7-unknown-linux-gnueabihf"
@@ -69,8 +74,6 @@ else
export CC_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc export CC_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc
export CXX_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ export CXX_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++
export PKG_CONFIG_ALLOW_CROSS=1 export PKG_CONFIG_ALLOW_CROSS=1
sudo apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf crossbuild-essential-armhf
elif [[ "${VSCODE_ARCH}" == "x64" ]]; then elif [[ "${VSCODE_ARCH}" == "x64" ]]; then
VSCODE_CLI_TARGET="x86_64-unknown-linux-gnu" VSCODE_CLI_TARGET="x86_64-unknown-linux-gnu"
fi fi

10
patches/cli.patch
View File

@@ -13,12 +13,14 @@ index 2ddefe1..ab9c658 100644
+ .join(args.release.quality.server_entrypoint().unwrap()); + .join(args.release.quality.server_entrypoint().unwrap());
diff --git a/cli/src/constants.rs b/cli/src/constants.rs diff --git a/cli/src/constants.rs b/cli/src/constants.rs
index 1e277a8..353aee7 100644 index 1e277a8..97f17d3 100644
--- a/cli/src/constants.rs --- a/cli/src/constants.rs
+++ b/cli/src/constants.rs +++ b/cli/src/constants.rs
@@ -36,2 +36,5 @@ pub const VSCODE_CLI_COMMIT: Option<&'static str> = option_env!("VSCODE_CLI_COMM @@ -35,3 +35,6 @@ pub const DOCUMENTATION_URL: Option<&'static str> = option_env!("VSCODE_CLI_DOCU
pub const VSCODE_CLI_UPDATE_ENDPOINT: Option<&'static str> = option_env!("VSCODE_CLI_UPDATE_URL"); pub const VSCODE_CLI_COMMIT: Option<&'static str> = option_env!("VSCODE_CLI_COMMIT");
+pub const VSCODE_CLI_DOWNLOAD_ENDPOINT: Option<&'static str> = option_env!("VSCODE_CLI_DOWNLOAD_URL"); -pub const VSCODE_CLI_UPDATE_ENDPOINT: Option<&'static str> = option_env!("VSCODE_CLI_UPDATE_URL");
+pub const VSCODE_CLI_UPDATE_ENDPOINT: Option<&'static str> = option_env!("VSCODE_CLI_UPDATE_ENDPOINT");
+pub const VSCODE_CLI_DOWNLOAD_ENDPOINT: Option<&'static str> = option_env!("VSCODE_CLI_DOWNLOAD_ENDPOINT");
+pub const VSCODE_CLI_APP_NAME: Option<&'static str> = option_env!("VSCODE_CLI_APP_NAME"); +pub const VSCODE_CLI_APP_NAME: Option<&'static str> = option_env!("VSCODE_CLI_APP_NAME");
+pub const VSCODE_CLI_BINARY_NAME: Option<&'static str> = option_env!("VSCODE_CLI_BINARY_NAME"); +pub const VSCODE_CLI_BINARY_NAME: Option<&'static str> = option_env!("VSCODE_CLI_BINARY_NAME");