Merge branch 'master' into insider

This commit is contained in:
Baptiste Augrain 2023-10-04 19:16:42 +02:00
commit fca50b1b9b
12 changed files with 80 additions and 42 deletions

View file

@ -86,7 +86,7 @@ jobs:
- name: Clone VSCode repo - name: Clone VSCode repo
run: ./get_repo.sh run: ./get_repo.sh
- uses: docker/setup-qemu-action@v2 - uses: docker/setup-qemu-action@v3
if: matrix.vscode_arch == 'arm64' || matrix.vscode_arch == 'ppc64le' if: matrix.vscode_arch == 'arm64' || matrix.vscode_arch == 'ppc64le'
- name: Install remote dependencies - name: Install remote dependencies
@ -239,7 +239,7 @@ jobs:
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }} SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
run: ./stores/snapcraft/check_version.sh run: ./stores/snapcraft/check_version.sh
- uses: docker/setup-qemu-action@v2 - uses: docker/setup-qemu-action@v3
if: env.SHOULD_DEPLOY == 'yes' if: env.SHOULD_DEPLOY == 'yes'
- uses: diddlesnaps/snapcraft-multiarch-action@v1 - uses: diddlesnaps/snapcraft-multiarch-action@v1

View file

@ -46,7 +46,7 @@ jobs:
vscode_arch: arm64 vscode_arch: arm64
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
ref: ${{ env.GITHUB_BRANCH }} ref: ${{ env.GITHUB_BRANCH }}

View file

@ -18,7 +18,7 @@ jobs:
VSCODE_QUALITY: insider VSCODE_QUALITY: insider
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
ref: insider ref: insider

View file

@ -51,7 +51,7 @@ jobs:
SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }} SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
ref: ${{ env.GITHUB_BRANCH }} ref: ${{ env.GITHUB_BRANCH }}
@ -123,7 +123,7 @@ jobs:
if: needs.build.outputs.SHOULD_DEPLOY == 'yes' if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
ref: ${{ env.GITHUB_BRANCH }} ref: ${{ env.GITHUB_BRANCH }}

View file

@ -83,7 +83,7 @@ jobs:
- name: Clone VSCode repo - name: Clone VSCode repo
run: ./get_repo.sh run: ./get_repo.sh
- uses: docker/setup-qemu-action@v2 - uses: docker/setup-qemu-action@v3
if: matrix.vscode_arch == 'arm64' || matrix.vscode_arch == 'ppc64le' if: matrix.vscode_arch == 'arm64' || matrix.vscode_arch == 'ppc64le'
- name: Install remote dependencies - name: Install remote dependencies
@ -228,7 +228,7 @@ jobs:
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }} SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
run: ./stores/snapcraft/check_version.sh run: ./stores/snapcraft/check_version.sh
- uses: docker/setup-qemu-action@v2 - uses: docker/setup-qemu-action@v3
if: env.SHOULD_DEPLOY == 'yes' if: env.SHOULD_DEPLOY == 'yes'
- uses: diddlesnaps/snapcraft-multiarch-action@v1 - uses: diddlesnaps/snapcraft-multiarch-action@v1

View file

@ -45,7 +45,7 @@ jobs:
vscode_arch: arm64 vscode_arch: arm64
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Setup Node.js environment - name: Setup Node.js environment
uses: actions/setup-node@v3 uses: actions/setup-node@v3

View file

@ -51,7 +51,7 @@ jobs:
SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }} SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Setup Node.js environment - name: Setup Node.js environment
uses: actions/setup-node@v3 uses: actions/setup-node@v3
@ -118,7 +118,7 @@ jobs:
if: needs.build.outputs.SHOULD_DEPLOY == 'yes' if: needs.build.outputs.SHOULD_DEPLOY == 'yes'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Check version - name: Check version
run: ./stores/winget/check_version.sh run: ./stores/winget/check_version.sh

View file

@ -39,15 +39,25 @@
## <a id="download-install"></a>Download/Install ## <a id="download-install"></a>Download/Install
:tada: :tada: [Download latest release here](https://github.com/VSCodium/vscodium/releases) :tada: :tada: :tada: :tada:
Download latest release here:
[stable](https://github.com/VSCodium/vscodium/releases) or
[insiders](https://github.com/VSCodium/vscodium-insiders/releases)
:tada: :tada:
[More info / helpful tips are here.](https://github.com/VSCodium/vscodium/blob/master/DOCS.md) [More info / helpful tips are here.](https://github.com/VSCodium/vscodium/blob/master/DOCS.md)
#### <a id="install-with-brew"></a>Install with Brew (Mac) #### <a id="install-with-brew"></a>Install with Brew (Mac)
If you are on a Mac and have [Homebrew](https://brew.sh/) installed: If you are on a Mac and have [Homebrew](https://brew.sh/) installed:
```bash ```bash
# stable
brew install --cask vscodium brew install --cask vscodium
# insiders
brew tap homebrew/cask-versions
brew install --cask vscodium-insiders
``` ```
*Note for macOS users: if you can't open the App, please read [the following troubleshooting](https://github.com/VSCodium/vscodium/wiki/Troubleshooting#macos).* *Note for macOS users: if you can't open the App, please read [the following troubleshooting](https://github.com/VSCodium/vscodium/wiki/Troubleshooting#macos).*
@ -55,8 +65,12 @@ brew install --cask vscodium
#### <a id="install-with-winget"></a>Install with Windows Package Manager (WinGet) #### <a id="install-with-winget"></a>Install with Windows Package Manager (WinGet)
If you use Windows and have [Windows Package Manager](https://github.com/microsoft/winget-cli) installed: If you use Windows and have [Windows Package Manager](https://github.com/microsoft/winget-cli) installed:
```bash ```cmd
winget install vscodium :: stable
winget install -e --id VSCodium.VSCodium
:: insider
winget install -e --id VSCodium.VSCodium.Insiders
``` ```
#### <a id="install-with-choco"></a>Install with Chocolatey (Windows) #### <a id="install-with-choco"></a>Install with Chocolatey (Windows)
@ -76,7 +90,8 @@ scoop install vscodium
#### <a id="install-with-snap"></a>Install with snap (GNU/Linux) #### <a id="install-with-snap"></a>Install with snap (GNU/Linux)
VSCodium is available in the [Snap Store](https://snapcraft.io/) as [Codium](https://snapcraft.io/codium), thanks to the help of the [Snapcrafters](https://github.com/snapcrafters/codium) community. VSCodium is available in the [Snap Store](https://snapcraft.io/) as [Codium](https://snapcraft.io/codium),
thanks to the help of the [Snapcrafters](https://github.com/snapcrafters/codium) community.
If your GNU/Linux distribution has support for [snaps](https://snapcraft.io/docs/installing-snapd): If your GNU/Linux distribution has support for [snaps](https://snapcraft.io/docs/installing-snapd):
```bash ```bash
snap install codium --classic snap install codium --classic
@ -84,18 +99,38 @@ snap install codium --classic
#### <a id="install-with-package-manager"></a>Install with Package Manager (GNU/Linux) #### <a id="install-with-package-manager"></a>Install with Package Manager (GNU/Linux)
You can always install using the downloads (deb, rpm, tar) on the [releases page](https://github.com/VSCodium/vscodium/releases), but you can also install using your favorite package manager and get automatic updates. [@paulcarroty](https://github.com/paulcarroty) has set up a repository with instructions [here](https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo). Any issues installing VSCodium using your package manager should be directed to that repository's issue tracker. You can always install using the downloads (deb, rpm, tar) on the releases page for
[stable](https://github.com/VSCodium/vscodium/releases) or
[insiders](https://github.com/VSCodium/vscodium-insiders/releases), but you can also
install using your favorite package manager and get automatic updates.
[@paulcarroty](https://github.com/paulcarroty) has set up a repository with instructions
for `apt`, `dnf` and `zypper` [here](https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo).
Any issues installing VSCodium using your package manager should be directed to that repository's issue tracker.
#### <a id="install-on-arch-linux"></a>Install on Arch Linux #### <a id="install-on-arch-linux"></a>Install on Arch Linux
VSCodium is available in [AUR](https://wiki.archlinux.org/index.php/Arch_User_Repository) as package [vscodium-bin](https://aur.archlinux.org/packages/vscodium-bin/), maintained by [@binex-dsk](https://github.com/binex-dsk). An alternative package [vscodium-git](https://aur.archlinux.org/packages/vscodium-git/), maintained by [@cedricroijakkers](https://github.com/cedricroijakkers), is also available should you wish to compile from source yourself. VSCodium is available in [AUR](https://wiki.archlinux.org/index.php/Arch_User_Repository),
maintained by [@binex-dsk](https://github.com/binex-dsk)
as package [vscodium-bin](https://aur.archlinux.org/packages/vscodium-bin/) (stable) and
as [vscodium-insiders-bin](https://aur.archlinux.org/packages/vscodium-insiders-bin).
If you want to save disk space by having VSCodium use the Electron system-wide, you also have
[vscodium-electron](https://aur.archlinux.org/packages/vscodium-electron),
maintained by [@m00nw4tch3r](https://aur.archlinux.org/account/m00nw4tch3r).
An alternative package [vscodium-git](https://aur.archlinux.org/packages/vscodium-git/),
maintained by [@cedricroijakkers](https://github.com/cedricroijakkers),
is also available should you wish to compile from source yourself.
#### <a id="flatpak"></a>Flatpak Option (GNU/Linux) #### <a id="flatpak"></a>Flatpak Option (GNU/Linux)
VSCodium is (unofficially) available as a Flatpak app [here](https://flathub.org/apps/details/com.vscodium.codium) and the build repo is [here](https://github.com/flathub/com.vscodium.codium). If your distribution has support for [flatpak](https://flathub.org), and you have enabled the [flathub repo](https://flatpak.org/setup/): VSCodium is (unofficially) available as a Flatpak app [here](https://flathub.org/apps/details/com.vscodium.codium)
and the build repo is [here](https://github.com/flathub/com.vscodium.codium).
If your distribution has support for [flatpak](https://flathub.org), and you have enabled the [flathub repo](https://flatpak.org/setup/):
```bash ```bash
flatpak install flathub com.vscodium.codium flatpak install flathub com.vscodium.codium
flatpak run com.vscodium.codium flatpak run com.vscodium.codium
``` ```

View file

@ -324,12 +324,13 @@ if [[ "${ASSETS}" != "null" ]]; then
export SHOULD_BUILD_TAR="no" export SHOULD_BUILD_TAR="no"
fi fi
if [[ -z $( contains "x86_64.AppImage" ) ]]; then # if [[ -z $( contains "x86_64.AppImage" ) ]]; then
echo "Building on Linux x64 because we have no AppImage" # echo "Building on Linux x64 because we have no AppImage"
export SHOULD_BUILD="yes" # export SHOULD_BUILD="yes"
else # else
export SHOULD_BUILD_APPIMAGE="no" # export SHOULD_BUILD_APPIMAGE="no"
fi # fi
export SHOULD_BUILD_APPIMAGE="no"
if [[ -z $( contains "${APP_NAME_LC}-reh-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then if [[ -z $( contains "${APP_NAME_LC}-reh-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
echo "Building on Linux x64 because we have no REH archive" echo "Building on Linux x64 because we have no REH archive"

View file

@ -15,7 +15,7 @@ index 0d7d3c5..90f75cc 100644
+ const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch))); + const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch)));
gulp.task(buildRpmTask); gulp.task(buildRpmTask);
diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
index 0ea6699..c4524de 100644 index 381539d..0f26614 100644
--- a/build/linux/dependencies-generator.js --- a/build/linux/dependencies-generator.js
+++ b/build/linux/dependencies-generator.js +++ b/build/linux/dependencies-generator.js
@@ -22,3 +22,3 @@ const types_2 = require("./rpm/types"); @@ -22,3 +22,3 @@ const types_2 = require("./rpm/types");
@ -24,7 +24,7 @@ index 0ea6699..c4524de 100644
+const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false; +const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/114.0.5735.199:chrome/installer/linux/BUILD.gn;l=64-80 // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/114.0.5735.199:chrome/installer/linux/BUILD.gn;l=64-80
diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
index c0d8112..3bb0366 100644 index 5c4b9d2..a2c629a 100644
--- a/build/linux/dependencies-generator.ts --- a/build/linux/dependencies-generator.ts
+++ b/build/linux/dependencies-generator.ts +++ b/build/linux/dependencies-generator.ts
@@ -23,3 +23,3 @@ import { isRpmArchString, RpmArchString } from './rpm/types'; @@ -23,3 +23,3 @@ import { isRpmArchString, RpmArchString } from './rpm/types';

View file

@ -133,9 +133,9 @@ else
yarn gulp "vscode-linux-${VSCODE_ARCH}-build-rpm" yarn gulp "vscode-linux-${VSCODE_ARCH}-build-rpm"
fi fi
if [[ "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then # if [[ "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then
. ../build/linux/appimage/build.sh # . ../build/linux/appimage/build.sh
fi # fi
cd .. cd ..
@ -156,12 +156,12 @@ else
mv vscode/.build/linux/rpm/*/*.rpm assets/ mv vscode/.build/linux/rpm/*/*.rpm assets/
fi fi
if [[ "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then # if [[ "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then
echo "Moving AppImage" # echo "Moving AppImage"
mv build/linux/appimage/out/*.AppImage* assets/ # mv build/linux/appimage/out/*.AppImage* assets/
find assets -name '*.AppImage*' -exec bash -c 'mv $0 ${0/_-_/-}' {} \; # find assets -name '*.AppImage*' -exec bash -c 'mv $0 ${0/_-_/-}' {} \;
fi # fi
VSCODE_PLATFORM="linux" VSCODE_PLATFORM="linux"
fi fi

View file

@ -48,7 +48,8 @@
], ],
"extensionEnabledApiProposals": { "extensionEnabledApiProposals": {
"ms-vscode.vscode-selfhost-test-provider": [ "ms-vscode.vscode-selfhost-test-provider": [
"testObserver" "testObserver",
"testMessageContextValue"
], ],
"VisualStudioExptTeam.vscodeintellicode-completions": [ "VisualStudioExptTeam.vscodeintellicode-completions": [
"inlineCompletionsAdditions" "inlineCompletionsAdditions"
@ -84,9 +85,7 @@
"envShellEvent", "envShellEvent",
"quickPickItemTooltip", "quickPickItemTooltip",
"terminalDataWriteEvent", "terminalDataWriteEvent",
"envCollectionWorkspace", "saveEditor"
"saveEditor",
"envCollectionOptions"
], ],
"ms-dotnettools.dotnet-interactive-vscode": [ "ms-dotnettools.dotnet-interactive-vscode": [
"notebookMessaging", "notebookMessaging",
@ -146,7 +145,6 @@
"ms-vscode.remote-server": [ "ms-vscode.remote-server": [
"resolvers", "resolvers",
"tunnels", "tunnels",
"tunnelFactory",
"contribViewsWelcome" "contribViewsWelcome"
], ],
"ms-vscode.remote-explorer": [ "ms-vscode.remote-explorer": [
@ -196,10 +194,14 @@
"handleIssueUri", "handleIssueUri",
"interactive", "interactive",
"interactiveUserActions", "interactiveUserActions",
"semanticSimilarity", "terminalContextMenu",
"terminalDataWriteEvent", "terminalDataWriteEvent",
"terminalSelection", "terminalSelection",
"terminalQuickFixProvider" "terminalQuickFixProvider",
"chatSlashCommands",
"readonlyMessage",
"mappedEditsProvider",
"aiRelatedInformation"
], ],
"GitHub.remotehub": [ "GitHub.remotehub": [
"contribRemoteHelp", "contribRemoteHelp",