diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index b872459..3b3cb14 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -141,7 +141,7 @@ jobs: RELEASE_VERSION: ${{ needs.build.outputs.RELEASE_VERSION }} - name: Release to WinGet - uses: vedantmgoyal2009/winget-releaser@v2 + uses: vedantmgoyal9/winget-releaser@main with: identifier: ${{ env.APP_IDENTIFIER }} version: ${{ env.RELEASE_VERSION }} diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml index 58c7cce..d9dfb46 100644 --- a/.github/workflows/stable-linux.yml +++ b/.github/workflows/stable-linux.yml @@ -143,13 +143,13 @@ jobs: include: - vscode_arch: x64 npm_arch: x64 - image: vscodium/vscodium-linux-build-agent:bionic-x64 + image: vscodium/vscodium-linux-build-agent:focal-x64 - vscode_arch: arm64 npm_arch: arm64 - image: vscodium/vscodium-linux-build-agent:bionic-arm64 + image: vscodium/vscodium-linux-build-agent:focal-arm64 - vscode_arch: armhf npm_arch: arm - image: vscodium/vscodium-linux-build-agent:bionic-armhf + image: vscodium/vscodium-linux-build-agent:focal-armhf - vscode_arch: riscv64 npm_arch: riscv64 image: vscodium/vscodium-linux-build-agent:focal-riscv64 diff --git a/.github/workflows/stable-windows.yml b/.github/workflows/stable-windows.yml index 843b1a6..fdfd2dc 100644 --- a/.github/workflows/stable-windows.yml +++ b/.github/workflows/stable-windows.yml @@ -136,7 +136,7 @@ jobs: RELEASE_VERSION: ${{ needs.build.outputs.RELEASE_VERSION }} - name: Release to WinGet - uses: vedantmgoyal2009/winget-releaser@v2 + uses: vedantmgoyal9/winget-releaser@main with: identifier: ${{ env.APP_IDENTIFIER }} version: ${{ env.RELEASE_VERSION }} diff --git a/announcements-extra.json b/announcements-extra.json index 9f82aa8..446335e 100644 --- a/announcements-extra.json +++ b/announcements-extra.json @@ -1,7 +1,7 @@ [ - { + { "id": "#1227", "title": "Issue(macOS): manual update to `1.90.x`", "url": "https://github.com/VSCodium/vscodium/issues/1917" - }, + } ] diff --git a/docs/howto-build.md b/docs/howto-build.md index bc07112..289c2e3 100644 --- a/docs/howto-build.md +++ b/docs/howto-build.md @@ -7,9 +7,6 @@ - [MacOS](#dependencies-macos) - [Windows](#dependencies-windows) - [Build Scripts](#build-scripts) -- [Build in Docker](#build-docker) - - [X64](#build-docker-x64) - - [ARM 32bits](#build-docker-arm32) - [Build Snap](#build-snap) - [Patch Update Process](#patch-update-process) - [Semi-Automated](#patch-update-process-semiauto) @@ -76,49 +73,6 @@ The script `build/build.sh` provides several flags: - `-p`: generate the packages/assets/installers - `-s`: do not retrieve the source code of Visual Studio Code, it won't delete the existing build -## Build in Docker - -To build for Linux, you can alternatively build VSCodium in docker - -### X64 - -Firstly, create the container with: -``` -docker run -ti --volume=:/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:bionic-x64 bash -``` -like -``` -docker run -ti --volume=$(pwd):/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:bionic-x64 bash -``` - -When inside the container, you can use the following commands to build: -``` -cd /root/vscodium - -./build/build.sh -``` - -### ARM 32bits - -Firstly, create the container with: -``` -docker run -ti --volume=:/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:bionic-armhf bash -``` -like -``` -docker run -ti --volume=$(pwd):/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:bionic-armhf bash -``` - -When inside the container, you can use the following commands to build: -``` -curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash - -sudo apt-get install -y nodejs desktop-file-utils - -cd /root/vscodium - -./build/build.sh -``` - ## Build Snap ``` diff --git a/package_linux_bin.sh b/package_linux_bin.sh index 0175b27..725fae7 100755 --- a/package_linux_bin.sh +++ b/package_linux_bin.sh @@ -26,7 +26,7 @@ if [[ "${VSCODE_ARCH}" == "riscv64" ]]; then export VSCODE_ELECTRON_REPO='riscv-forks/electron-riscv-releases' export ELECTRON_SKIP_BINARY_DOWNLOAD=1 export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 - ELECTRON_VERSION="30.3.1" + ELECTRON_VERSION="30.4.0" if [[ "${ELECTRON_VERSION}" != "$(yarn config get target)" ]]; then # Fail the pipeline if electron target doesn't match what is used. # Look for releases here if electron version used by vscode changed: @@ -35,7 +35,7 @@ if [[ "${VSCODE_ARCH}" == "riscv64" ]]; then exit 1 fi export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}.riscv1" - echo "ad36c48a8b0e061fbdeda91ff2a4c9a2f39d016c8ba23c7b4ed1394c37b1503b *electron-v${ELECTRON_VERSION}-linux-riscv64.zip" >> build/checksums/electron.txt + echo "b391bd6e063c34c31b1048615994fca0a5922d5a6b21d6cee6c4335850791516 *electron-v${ELECTRON_VERSION}-linux-riscv64.zip" >> build/checksums/electron.txt fi if [[ -d "../patches/linux/client/" ]]; then diff --git a/product.json b/product.json index bbc7bda..6a29d66 100644 --- a/product.json +++ b/product.json @@ -200,9 +200,7 @@ "treeViewMarkdownMessage" ], "GitHub.copilot": [ - "inlineCompletionsAdditions", - "interactive", - "terminalDataWriteEvent" + "inlineCompletionsAdditions" ], "GitHub.copilot-nightly": [ "inlineCompletionsAdditions", @@ -315,6 +313,9 @@ "documentPaste", "lmTools" ], + "vscjava.vscode-java-pack": [ + "lmTools" + ], "ms-dotnettools.csdevkit": [ "inlineCompletionsAdditions" ], diff --git a/stable.json b/stable.json index 9798fd9..9c7a6be 100644 --- a/stable.json +++ b/stable.json @@ -1,4 +1,4 @@ { - "tag": "1.92.1", - "commit": "eaa41d57266683296de7d118f574d0c2652e1fc4" + "tag": "1.93.0", + "commit": "4849ca9bdf9666755eb463db297b69e5385090e3" }