mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-02 17:23:40 -05:00
Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)
* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 * Fixes and cleanup * Distro * Fix hygiene yarn * delete no yarn lock changes file * Fix hygiene * Fix layer check * Fix CI * Skip lib checks * Remove tests deleted in vs code * Fix tests * Distro * Fix tests and add removed extension point * Skip failing notebook tests for now * Disable broken tests and cleanup build folder * Update yarn.lock and fix smoke tests * Bump sqlite * fix contributed actions and file spacing * Fix user data path * Update yarn.locks Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
@@ -36,9 +36,27 @@ if [ "@@NAME@@" != "code-oss" ]; then
|
||||
eval $(apt-config shell APT_TRUSTED_PARTS Dir::Etc::trustedparts/d)
|
||||
CODE_TRUSTED_PART=${APT_TRUSTED_PARTS}microsoft.gpg
|
||||
|
||||
# Sourced from https://packages.microsoft.com/keys/microsoft.asc
|
||||
if [ ! -f $CODE_TRUSTED_PART ]; then
|
||||
echo "-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
# Install repository source list
|
||||
WRITE_SOURCE=0
|
||||
if [ ! -f $CODE_SOURCE_PART ] && [ ! -f /etc/rpi-issue ]; then
|
||||
# Write source list if it does not exist and we're not running on Raspberry Pi OS
|
||||
WRITE_SOURCE=1
|
||||
elif grep -Eq "http:\/\/packages\.microsoft\.com\/repos\/vscode" $CODE_SOURCE_PART; then
|
||||
# Migrate from old repository
|
||||
WRITE_SOURCE=1
|
||||
elif grep -q "# disabled on upgrade to" $CODE_SOURCE_PART; then
|
||||
# Write source list if it was disabled by OS upgrade
|
||||
WRITE_SOURCE=1
|
||||
fi
|
||||
|
||||
if [ "$WRITE_SOURCE" -eq "1" ]; then
|
||||
echo "### THIS FILE IS AUTOMATICALLY CONFIGURED ###
|
||||
# You may comment out this entry, but any other modifications may be lost.
|
||||
deb [arch=amd64,arm64,armhf] http://packages.microsoft.com/repos/code stable main" > $CODE_SOURCE_PART
|
||||
|
||||
# Sourced from https://packages.microsoft.com/keys/microsoft.asc
|
||||
if [ ! -f $CODE_TRUSTED_PART ]; then
|
||||
echo "-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v1.4.7 (GNU/Linux)
|
||||
|
||||
mQENBFYxWIwBCADAKoZhZlJxGNGWzqV+1OG1xiQeoowKhssGAKvd+buXCGISZJwT
|
||||
@@ -57,25 +75,7 @@ XdNgj4Jd2/g6T9InmWT0hASljur+dJnzNiNCkbn9KbX7J/qK1IbR8y560yRmFsU+
|
||||
NdCFTW7wY0Fb1fWJ+/KTsC4=
|
||||
=J6gs
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
" | gpg --dearmor > microsoft.gpg
|
||||
mv microsoft.gpg $CODE_TRUSTED_PART
|
||||
fi
|
||||
|
||||
# Install repository source list
|
||||
WRITE_SOURCE=0
|
||||
if [ ! -f $CODE_SOURCE_PART ]; then
|
||||
# Write source list if it does not exist
|
||||
WRITE_SOURCE=1
|
||||
elif grep -Eq "http:\/\/packages\.microsoft\.com\/repos\/vscode" $CODE_SOURCE_PART; then
|
||||
# Migrate from old repository
|
||||
WRITE_SOURCE=1
|
||||
elif grep -q "# disabled on upgrade to" $CODE_SOURCE_PART; then
|
||||
# Write source list if it was disabled by OS upgrade
|
||||
WRITE_SOURCE=1
|
||||
fi
|
||||
if [ "$WRITE_SOURCE" -eq "1" ]; then
|
||||
echo "### THIS FILE IS AUTOMATICALLY CONFIGURED ###
|
||||
# You may comment out this entry, but any other modifications may be lost.
|
||||
deb [arch=amd64,arm64,armhf] http://packages.microsoft.com/repos/code stable main" > $CODE_SOURCE_PART
|
||||
" | gpg --dearmor > $CODE_TRUSTED_PART
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Name: @@NAME@@
|
||||
Version: @@VERSION@@
|
||||
Release: @@RELEASE@@.el7
|
||||
Release: @@RELEASE@@.el8
|
||||
Summary: Code editing. Redefined.
|
||||
Group: Development/Tools
|
||||
Vendor: Microsoft Corporation
|
||||
@@ -14,6 +14,10 @@ AutoReq: 0
|
||||
%description
|
||||
Visual Studio Code is a new choice of tool that combines the simplicity of a code editor with what developers need for the core edit-build-debug cycle. See https://code.visualstudio.com/docs/setup/linux for installation instructions and FAQ.
|
||||
|
||||
# Don't generate build_id links to prevent conflicts when installing multiple
|
||||
# versions of VS Code alongside each other (e.g. `code` and `code-insiders`)
|
||||
%define _build_id_links none
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}/usr/share/@@NAME@@
|
||||
mkdir -p %{buildroot}/usr/share/applications
|
||||
|
||||
Reference in New Issue
Block a user