Compare commits

...

47 Commits

Author SHA1 Message Date
Peter Squicciarini
cfc5bbd51e Merge pull request #275 from stripedpajamas/rn-icon
Move code-icon.svg to updated path
2019-10-28 08:36:47 -07:00
Peter Squicciarini
d3a7edee21 Move code-icon.svg to updated path 2019-10-27 21:02:01 -07:00
Peter Squicciarini
6bf38fa316 Merge pull request #274 from stripedpajamas/crash
Update path to crash reporter setting
2019-10-26 20:42:23 -07:00
Peter Squicciarini
d203723bd5 Update path to crash reporter setting 2019-10-25 17:51:55 -07:00
Peter Squicciarini
880f505515 Merge pull request #258 from stripedpajamas/shell
Remove & from win32ShellNameShort
2019-10-05 13:26:20 -07:00
Peter Squicciarini
8b57482521 Remove & from win32ShellNameShort 2019-10-05 13:13:11 -07:00
Peter Squicciarini
6d1b1c06bc Merge pull request #257 from ajkerzner/ubuntu14
Update TravisCI config to use Ubuntu 14.04
2019-09-29 19:17:23 -07:00
Alex Kerzner
112b141bf2 Update TravisCI config to use Ubuntu 14.04 2019-09-29 10:12:09 -04:00
Peter Squicciarini
53b56dbebb Merge pull request #251 from stripedpajamas/no-trigger
Stop triggering Azure
2019-09-05 12:56:06 -07:00
Peter Squicciarini
cd6e1485b5 Stop triggering Azure 2019-09-04 15:39:23 -07:00
Peter Squicciarini
f787c21b3c Merge pull request #244 from stripedpajamas/win-commit
Set BUILD_SOURCEVERSION to LATEST_MS_COMMIT explicitly
2019-08-20 16:53:38 -07:00
Peter Squicciarini
74e4592337 Set BUILD_SOURCEVERSION to LATEST_MS_COMMIT explicitly 2019-08-20 15:17:17 -07:00
Peter Squicciarini
9afbbd903b Merge pull request #237 from stripedpajamas/wait
Update build process
2019-08-09 10:37:08 -07:00
Peter Squicciarini
e21f491ecd Try keep alive for minify-vscode task 2019-08-09 09:42:15 -07:00
Peter Squicciarini
5b1a4a1950 Use new gulp targets 2019-08-09 08:49:47 -07:00
Peter Squicciarini
91f1d58dd7 Try another method to keep build process alive 2019-08-08 17:28:04 -07:00
Peter Squicciarini
d358627a19 Wait for Darwin build 2019-08-08 15:41:39 -07:00
Peter Squicciarini
06cc20f63b Merge pull request #233 from stripedpajamas/fix-hash-paths
Fix hash paths
2019-07-26 00:38:34 -07:00
Peter Squicciarini
88503d7855 Fix hash paths 2019-07-25 09:07:08 -07:00
Peter Squicciarini
b44a4f56c4 Merge pull request #227 from stripedpajamas/win32-system-update
Add update support for Win32 system install
2019-07-09 16:26:01 -07:00
Peter Squicciarini
72781d2f52 Add update support for Win32 system install 2019-07-09 15:25:17 -07:00
Peter Squicciarini
492c8c658e Merge pull request #223 from stripedpajamas/no-linux-ia32
Remove Linux 32-bit code paths
2019-07-04 14:25:56 -07:00
Peter Squicciarini
59ef86968e Remove Linux 32-bit code paths 2019-07-04 14:03:18 -07:00
Peter Squicciarini
49489575bb Update README.md
Make it clear that VSCodium build process downloads files
2019-06-30 12:51:58 -07:00
Peter Squicciarini
606674936f Merge pull request #216 from stripedpajamas/links
Add additional urls to product.json
2019-06-29 13:46:56 -07:00
Peter Squicciarini
4a0a474af7 Add additional urls to product.json 2019-06-28 08:39:27 -07:00
Peter Squicciarini
8f8a71d932 Merge pull request #211 from simooooone/codium_renaming_fixes
Updated DOCS.md instructions to reference new binary name
2019-06-26 11:19:56 -07:00
Simone Foschi
5dfd780291 Fixed other typos and one image path in DOCS.md 2019-06-26 18:51:31 +02:00
Peter Squicciarini
2653d09ffa Merge pull request #210 from stripedpajamas/links
Add documentation and introductory videos urls
2019-06-24 10:40:23 -07:00
Simone Foschi
f3b156bfcd fixed typo 2019-06-24 19:37:30 +02:00
Peter Squicciarini
4be6447a1d Add documentation and introductory videos urls 2019-06-23 19:29:33 -07:00
Peter Squicciarini
1245596c1c Merge pull request #203 from tyu1996/master
Changed from 'vscodium' to 'codium' in AppImage config file
2019-06-22 09:54:25 -07:00
Brian
c46aebbbdc Changed from 'vscodium' to 'codium'
Updated as [#203](https://github.com/VSCodium/vscodium/pull/203) requested.
2019-06-19 17:34:48 +08:00
Brian
079e741bcc Update VSCodium-AppImage-Recipe.yml 2019-06-18 13:57:26 +08:00
Peter Squicciarini
8861d9c2d9 Merge pull request #200 from stripedpajamas/fix-windows-commit
Set BUILD_SOURCEVERSION to the MS commit
2019-06-16 08:15:06 -07:00
Peter Squicciarini
d213b48a7f Set BUILD_SOURCEVERSION to the MS commit 2019-06-14 21:45:28 -07:00
Peter Squicciarini
6d24ed1d62 Merge pull request #195 from janniks/patch-1
Fix typo
2019-06-13 20:21:22 -07:00
Peter Squicciarini
99b3268f2b Merge pull request #179 from esclerofilo/master
change icon name to vscodium.png
2019-06-13 20:15:33 -07:00
Jannik
4baaf93eb2 Fix typo 2019-06-12 11:40:13 +02:00
Vicente Reyes
1c13ffb556 fix merge conflicts 2019-06-11 17:31:48 -04:00
Peter Squicciarini
db1afbd17a Merge branch 'master' of https://github.com/vscodium/vscodium 2019-06-10 21:39:30 -07:00
Peter Squicciarini
b5a6849834 Add retry logic to git push 2019-06-10 21:35:15 -07:00
Peter Squicciarini
b97f997a40 Merge pull request #187 from PalinuroSec/patch-1
change vscodium to codium in debian postinst
2019-06-09 14:08:51 -07:00
Lorenzo "Palinuro" Faletra
c2b46ceb35 change vscodium to codium in debian postinst 2019-06-09 14:33:57 +02:00
Peter Squicciarini
b6b51ba510 Merge branch 'master' of https://github.com/vscodium/vscodium 2019-06-06 16:23:50 -07:00
Peter Squicciarini
3f1e9ec9b4 Upgrade to Node 10 2019-06-06 16:22:04 -07:00
Vicente Reyes
f1233fc9b8 change icon name to vscodium.png 2019-05-29 23:26:59 -04:00
14 changed files with 90 additions and 107 deletions

View File

@@ -3,17 +3,11 @@ matrix:
- os: linux
sudo: required
env: BUILDARCH=x64
- os: linux
sudo: required
env: BUILDARCH=ia32
# arm64 builds don't work yet
# - os: linux
# sudo: required
# env: BUILDARCH=arm64
dist: trusty
- os: osx
language: node_js
node_js: "8"
node_js: "10"
before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
@@ -24,7 +18,6 @@ before_install:
script:
- ./build.sh
- ./trigger-azure.sh
before_deploy:
- ./sign_mac_app.sh
@@ -44,12 +37,9 @@ deploy:
- ./*.zip
- ./*.tar.gz
- ./*.dmg
- vscode/.build/linux/deb/i386/deb/*.deb
- vscode/.build/linux/rpm/i386/*.rpm
- vscode/.build/linux/deb/amd64/deb/*.deb
- vscode/.build/linux/rpm/x86_64/*.rpm
- vscode/.build/linux/deb/arm64/deb/*.deb
- vscode/out/*.AppImage
- ./*.deb
- ./*.rpm
- ./*.AppImage
on:
all_branches: true
condition: $SHOULD_BUILD = yes

10
DOCS.md
View File

@@ -80,18 +80,18 @@ $ defaults write com.visualstudio.code.oss ApplePressAndHoldEnabled -bool false
## <a id="terminal-support"></a>How do I open VSCodium from the terminal?
- Go to the command palette (View | Command Palette...)
- Choose `Shell command: Install 'vscodium' command in PATH`.
- Choose `Shell command: Install 'codium' command in PATH`.
![](https://user-images.githubusercontent.com/2707340/45751224-bd21a500-bbdf-11e8-8fb7-b645b97aae49.png)
![](https://user-images.githubusercontent.com/2707340/60140295-18338a00-9766-11e9-8fda-b525b6f15c13.png)
This allows you to open files or directories in VSCodium directly from your terminal:
```bash
~/in-my-project $ vscodium . # open this directory
~/in-my-project $ vscodium file.txt # open this file
~/in-my-project $ codium . # open this directory
~/in-my-project $ codium file.txt # open this file
```
Feel free to alias this command to something easier to type in your shell profile (e.g. `alias code=vscodium`).
Feel free to alias this command to something easier to type in your shell profile (e.g. `alias code=codium`).
## <a id="gentoo-overlay"></a>Gentoo ebuild/overlay

View File

@@ -77,7 +77,7 @@ This repo exists so that you don't have to download+build from source. The build
If you want to build from source yourself, head over to [Microsoft's vscode repo](https://github.com/Microsoft/vscode) and follow their [instructions](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#build-and-run). This repo exists to make it easier to get the latest version of MIT-licensed VSCode.
Microsoft's build process does download additional files. This was brought up in [Microsoft/vscode#49159](https://github.com/Microsoft/vscode/issues/49159) and [Microsoft/vscode#45978](https://github.com/Microsoft/vscode/issues/45978). These are the packages downloaded during build:
Microsoft's build process (which we are running to build the binaries) does download additional files. This was brought up in [Microsoft/vscode#49159](https://github.com/Microsoft/vscode/issues/49159) and [Microsoft/vscode#45978](https://github.com/Microsoft/vscode/issues/45978). These are the packages downloaded during build:
- Extensions from the Microsoft Marketplace:
- ms-vscode.node-debug2
@@ -94,7 +94,7 @@ For more information on getting all the telemetry disabled and tips for migratin
### Extension Licensing
Please note that some Visual Studio Code extensions have licenses that restrict their use to the official Visual Studio Code builds and therefore do not work with VSCodium. See [this note](https://github.com/VSCodium/vscodium/blob/master/DOCS.md#proprietary-debugging-tools) on the Docs page for what's been found so far and possible workarounds.
### How do are the VSCodium binaries built?
### How are the VSCodium binaries built?
If you would like to see the commands we run to build `vscode` into VSCodium binaries, have a look at the [`.travis.yml` file](https://github.com/VSCodium/vscodium/blob/master/.travis.yml) (for Linux and OS X builds) and the [`win32-build.yml` file](https://github.com/VSCodium/vscodium/blob/master/win32-build.yml) (for Windows builds). These build files call all the other scripts in the repo. If you find something that doesn't make sense, feel free to ask about it [on Gitter](https://gitter.im/VSCodium/Lobby).
The builds are run every day, but exit early if there isn't a new release from Microsoft. To examine the build logs, go [here for Linux / OS X](https://travis-ci.com/VSCodium/vscodium) and [here for Windows](https://dev.azure.com/vscodium/VSCodium/_build?definitionId=1)

View File

@@ -17,13 +17,13 @@ ingredients:
script:
- pwd
- cp ../.build/linux/deb/amd64/deb/*.deb .
- ls vscodium_*.deb | cut -d _ -f 2 > VERSION
- ls codium_*.deb | cut -d _ -f 2 > VERSION
script:
- sed -i -e 's|/usr/share/vscodium/||g' usr/share/applications/vscodium.desktop
- sed -i -e 's|com.visualstudio.code.oss|vscodium|g' usr/share/applications/vscodium.desktop
- cp usr/share/applications/vscodium.desktop .
- cp usr/share/pixmaps/com.visualstudio.code.oss.png vscodium.png
- sed -i -e 's|/usr/share/codium/||g' usr/share/applications/codium.desktop
- sed -i -e 's|com.visualstudio.code.oss|vscodium|g' usr/share/applications/codium.desktop
- cp usr/share/applications/codium.desktop .
- cp usr/share/pixmaps/vscodium.png vscodium.png
- convert vscodium.png -resize 512x512 usr/share/icons/hicolor/512x512/apps/vscodium.png
- convert vscodium.png -resize 256x256 usr/share/icons/hicolor/256x256/apps/vscodium.png
- convert vscodium.png -resize 128x128 usr/share/icons/hicolor/128x128/apps/vscodium.png
@@ -32,4 +32,4 @@ script:
- convert vscodium.png -resize 32x32 usr/share/icons/hicolor/32x32/apps/vscodium.png
- convert vscodium.png -resize 24x24 usr/share/icons/hicolor/24x24/apps/vscodium.png
- convert vscodium.png -resize 22x22 usr/share/icons/hicolor/22x22/apps/vscodium.png
- ( cd usr/bin/ ; ln -s ../share/vscodium/codium . )
- ( cd usr/bin/ ; ln -s ../share/codium/codium . )

View File

@@ -1,5 +1,17 @@
#!/bin/bash
function keep_alive() {
while true; do
date
sleep 60
done
}
if [[ "$SHOULD_BUILD" == "yes" ]]; then
export BUILD_SOURCEVERSION=$LATEST_MS_COMMIT
echo "LATEST_MS_COMMIT: ${LATEST_MS_COMMIT}"
echo "BUILD_SOURCEVERSION: ${BUILD_SOURCEVERSION}"
cp -rp src/* vscode/
cd vscode
@@ -8,9 +20,15 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
../update_settings.sh
yarn
yarn postinstall
mv product.json product.json.bak
# set fields in product.json
tipsAndTricksUrl='setpath(["tipsAndTricksUrl"]; "https://go.microsoft.com/fwlink/?linkid=852118")'
twitterUrl='setpath(["twitterUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533687")'
requestFeatureUrl='setpath(["requestFeatureUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533482")'
documentationUrl='setpath(["documentationUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533484#vscode")'
introductoryVideosUrl='setpath(["introductoryVideosUrl"]; "https://go.microsoft.com/fwlink/?linkid=832146")'
extensionAllowedBadgeProviders='setpath(["extensionAllowedBadgeProviders"]; ["api.bintray.com", "api.travis-ci.com", "api.travis-ci.org", "app.fossa.io", "badge.fury.io", "badge.waffle.io", "badgen.net", "badges.frapsoft.com", "badges.gitter.im", "badges.greenkeeper.io", "cdn.travis-ci.com", "cdn.travis-ci.org", "ci.appveyor.com", "circleci.com", "cla.opensource.microsoft.com", "codacy.com", "codeclimate.com", "codecov.io", "coveralls.io", "david-dm.org", "deepscan.io", "dev.azure.com", "flat.badgen.net", "gemnasium.com", "githost.io", "gitlab.com", "godoc.org", "goreportcard.com", "img.shields.io", "isitmaintained.com", "marketplace.visualstudio.com", "nodesecurity.io", "opencollective.com", "snyk.io", "travis-ci.com", "travis-ci.org", "visualstudio.com", "vsmarketplacebadge.apphb.com", "www.bithound.io", "www.versioneye.com"])'
updateUrl='setpath(["updateUrl"]; "https://vscodium.now.sh")'
releaseNotesUrl='setpath(["releaseNotesUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533483#vscode")'
@@ -21,18 +39,19 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
extensionsGallery='setpath(["extensionsGallery"]; {"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", "itemUrl": "https://marketplace.visualstudio.com/items"})'
nameShort='setpath(["nameShort"]; "VSCodium")'
nameLong='setpath(["nameLong"]; "VSCodium")'
linuxIconName='setpath(["linuxIconName"]; "vscodium")'
applicationName='setpath(["applicationName"]; "codium")'
win32MutexName='setpath(["win32MutexName"]; "vscodium")'
win32DirName='setpath(["win32DirName"]; "VSCodium")'
win32NameVersion='setpath(["win32NameVersion"]; "VSCodium")'
win32RegValueName='setpath(["win32RegValueName"]; "VSCodium")'
win32AppUserModelId='setpath(["win32AppUserModelId"]; "Microsoft.VSCodium")'
win32ShellNameShort='setpath(["win32ShellNameShort"]; "V&SCodium")'
win32ShellNameShort='setpath(["win32ShellNameShort"]; "VSCodium")'
win32x64UserAppId='setpath (["win32x64UserAppId"]; "{{2E1F05D1-C245-4562-81EE-28188DB6FD17}")'
urlProtocol='setpath(["urlProtocol"]; "vscodium")'
extensionAllowedProposedApi='setpath(["extensionAllowedProposedApi"]; getpath(["extensionAllowedProposedApi"]) + ["ms-vsliveshare.vsliveshare"])'
product_json_changes="${extensionAllowedBadgeProviders} | ${updateUrl} | ${releaseNotesUrl} | ${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${nameShort} | ${nameLong} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${extensionAllowedProposedApi}"
product_json_changes="${tipsAndTricksUrl} | ${twitterUrl} | ${requestFeatureUrl} | ${documentationUrl} | ${introductoryVideosUrl} | ${extensionAllowedBadgeProviders} | ${updateUrl} | ${releaseNotesUrl} | ${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${nameShort} | ${nameLong} | ${linuxIconName} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${extensionAllowedProposedApi}"
cat product.json.bak | jq "${product_json_changes}" > product.json
cat product.json
../undo_telemetry.sh
@@ -44,23 +63,43 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
# unless the app name is code-oss
# as we are renaming the application to vscodium
# we need to edit a line in the post install template
sed -i "s/code-oss/vscodium/" resources/linux/debian/postinst.template
sed -i "s/code-oss/codium/" resources/linux/debian/postinst.template
fi
yarn gulp compile-build
yarn gulp compile-extensions-build
# this task is very slow on mac, so using a keep alive to keep travis alive
keep_alive &
KA_PID=$!
yarn gulp minify-vscode
kill $KA_PID
yarn gulp minify-vscode-reh
yarn gulp minify-vscode-reh-web
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
npm install --global create-dmg
npm run gulp -- "vscode-darwin-min"
yarn gulp vscode-darwin-min-ci
yarn gulp vscode-reh-darwin-min-ci
yarn gulp vscode-reh-web-darwin-min-ci
elif [[ "$CI_WINDOWS" == "True" ]]; then
cp LICENSE.txt LICENSE.rtf # windows build expects rtf license
npm run gulp -- "vscode-win32-${BUILDARCH}-min"
npm run gulp -- "vscode-win32-${BUILDARCH}-inno-updater"
npm run gulp -- "vscode-win32-${BUILDARCH}-system-setup"
npm run gulp -- "vscode-win32-${BUILDARCH}-user-setup"
npm run gulp -- "vscode-win32-${BUILDARCH}-archive"
yarn gulp "vscode-win32-${BUILDARCH}-min-ci"
yarn gulp "vscode-reh-win32-${BUILDARCH}-min-ci"
yarn gulp "vscode-reh-web-win32-${BUILDARCH}-min-ci"
yarn gulp "vscode-win32-${BUILDARCH}-code-helper"
yarn gulp "vscode-win32-${BUILDARCH}-inno-updater"
yarn gulp "vscode-win32-${BUILDARCH}-archive"
yarn gulp "vscode-win32-${BUILDARCH}-system-setup"
yarn gulp "vscode-win32-${BUILDARCH}-user-setup"
else # linux
npm run gulp -- "vscode-linux-${BUILDARCH}-min"
npm run gulp -- "vscode-linux-${BUILDARCH}-build-deb"
npm run gulp -- "vscode-linux-${BUILDARCH}-build-rpm"
yarn gulp vscode-linux-x64-min-ci
yarn gulp vscode-reh-linux-x64-min-ci
yarn gulp vscode-reh-web-linux-x64-min-ci
yarn gulp "vscode-linux-${BUILDARCH}-build-deb"
yarn gulp "vscode-linux-${BUILDARCH}-build-rpm"
. ../create_appimage.sh
fi

View File

@@ -15,25 +15,6 @@ if [ "$GITHUB_TOKEN" != "" ]; then
echo "Building on Mac because we have no ZIP"
export SHOULD_BUILD="yes"
fi
elif [[ $BUILDARCH == "ia32" ]]; then
HAVE_IA32_RPM=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["i386.rpm"])')
HAVE_IA32_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["i386.deb"])')
HAVE_IA32_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "ia32-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
if [[ "$HAVE_IA32_RPM" != "true" ]]; then
echo "Building on Linux ia32 because we have no RPM"
export SHOULD_BUILD="yes"
fi
if [[ "$HAVE_IA32_DEB" != "true" ]]; then
echo "Building on Linux ia32 because we have no DEB"
export SHOULD_BUILD="yes"
fi
if [[ "$HAVE_IA32_TAR" != "true" ]]; then
echo "Building on Linux ia32 because we have no TAR"
export SHOULD_BUILD="yes"
fi
if [[ "$SHOULD_BUILD" != "yes" ]]; then
echo "Already have all the Linux ia32 builds"
fi
elif [[ $BUILDARCH == "arm64" ]]; then
# HAVE_ARM64_RPM=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["arm64.rpm"])')
HAVE_ARM64_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["arm64.deb"])')

View File

@@ -4,9 +4,6 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
cd VSCode-darwin
zip -r -X -y ../VSCodium-darwin-${LATEST_MS_TAG}.zip ./*.app
elif [[ "$BUILDARCH" == "ia32" ]]; then
cd VSCode-linux-ia32
tar czf ../VSCodium-linux-ia32-${LATEST_MS_TAG}.tar.gz .
elif [[ "$BUILDARCH" == "arm64" ]]; then
cd VSCode-linux-arm64
tar czf ../VSCodium-linux-arm64-${LATEST_MS_TAG}.tar.gz .

View File

@@ -6,22 +6,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
else
sudo apt-get update
sudo apt-get install -y fakeroot rpm jq
if [[ "$BUILDARCH" == "ia32" ]]; then
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install -y gcc-multilib g++-multilib
sudo apt-get install -y \
libgirepository-1.0-1:i386 \
gir1.2-glib-2.0:i386 \
libglib2.0-dev:i386 \
gir1.2-secret-1:i386 \
libx11-dev:i386 \
libxkbfile-dev:i386 \
libsecret-1-dev:i386
export CFLAGS=-m32
export CXXFLAGS=-m32
export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
elif [[ $BUILDARCH == "arm64" ]]; then
if [[ $BUILDARCH == "arm64" ]]; then
echo "deb http://ports.ubuntu.com/ubuntu-ports/ trusty main" | sudo tee -a /etc/apt/sources.list.d/arm64.list >/dev/null
sudo dpkg --add-architecture arm64
sudo apt-get update

View File

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

20
sum.sh
View File

@@ -27,21 +27,13 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
sum_file VSCodiumUserSetup-*.exe
sum_file VSCodium-win32-*.zip
else # linux
if [[ "$BUILDARCH" == "x64" ]]; then
deb_arch=amd64
rpm_arch=x86_64
cp vscode/out/*.AppImage .
cp vscode/.build/linux/deb/amd64/deb/*.deb .
cp vscode/.build/linux/rpm/x86_64/*.rpm .
# app image is x64 only
sum_file vscode/out/*.AppImage
cp vscode/out/*.{sha256,sha1} .
elif [[ "$BUILDARCH" == "ia32" ]]; then
deb_arch=i386
rpm_arch=i386
fi
sum_file *.AppImage
sum_file VSCodium-linux*.tar.gz
sum_file vscode/.build/linux/deb/${deb_arch}/deb/*.deb
sum_file vscode/.build/linux/rpm/${rpm_arch}/*.rpm
cp vscode/.build/linux/deb/${deb_arch}/deb/*.{sha256,sha1} .
cp vscode/.build/linux/rpm/${rpm_arch}/*.{sha256,sha1} .
sum_file *.deb
sum_file *.rpm
fi
fi

View File

@@ -1,7 +0,0 @@
if [ "$AZURE_TOKEN" != "" ]; then
if [[ "$SHOULD_BUILD" == "yes" ]]; then
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
curl -X POST -H "Content-Type: application/json" -H "Authorization: Basic $AZURE_TOKEN" -d '{"definition":{"id":1}}' https://dev.azure.com/VSCodium/vscodium/_apis/build/builds?api-version=5.0-preview.5
fi
fi
fi

View File

@@ -46,4 +46,4 @@ update_setting () {
}
update_setting "$TELEMETRY_ENABLE" src/vs/platform/telemetry/common/telemetryService.ts
update_setting "$TELEMETRY_CRASH_REPORTER" src/vs/workbench/electron-browser/main.contribution.ts
update_setting "$TELEMETRY_CRASH_REPORTER" src/vs/workbench/electron-browser/desktop.contribution.ts

View File

@@ -92,8 +92,8 @@ updateLatestVersion() {
# thank you https://www.vinaygopinath.me/blog/tech/commit-to-master-branch-on-github-using-travis-ci/
git clone https://github.com/${VERSIONS_REPO}.git
cd versions
git config user.email "travis@travis-ci.org"
git config user.name "Travis CI"
git config user.email "vscodium-ci@not-real.com"
git config user.name "VSCodium CI"
git remote rm origin
git remote add origin https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@github.com/${VERSIONS_REPO}.git > /dev/null 2>&1
cd ..
@@ -105,8 +105,11 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
JSON="$(generateJson ${ASSET_NAME})"
updateLatestVersion "$VERSION_PATH" "$JSON"
elif [[ "$CI_WINDOWS" == "True" ]]; then
# windows update service supports user and archive types
# so we will run the commands twice
# system installer
ASSET_NAME=VSCodiumSetup-${BUILDARCH}-${LATEST_MS_TAG}.exe
VERSION_PATH="win32/${BUILDARCH}/system"
JSON="$(generateJson ${ASSET_NAME})"
updateLatestVersion "$VERSION_PATH" "$JSON"
# user installer
ASSET_NAME=VSCodiumUserSetup-${BUILDARCH}-${LATEST_MS_TAG}.exe
@@ -122,7 +125,6 @@ elif [[ "$CI_WINDOWS" == "True" ]]; then
else # linux
# update service links to tar.gz file
# see https://update.code.visualstudio.com/api/update/linux-x64/stable/VERSION
# and https://update.code.visualstudio.com/api/update/linux-ia32/stable/VERSION
# as examples
ASSET_NAME=VSCodium-linux-${BUILDARCH}-${LATEST_MS_TAG}.tar.gz
VERSION_PATH="linux/${BUILDARCH}"
@@ -136,6 +138,9 @@ git pull origin master # in case another build just pushed
git add .
dateAndMonth=`date "+%D %T"`
git commit -m "Travis update: $dateAndMonth (Build $TRAVIS_BUILD_NUMBER)"
git push origin master --quiet
if ! git push origin master --quiet; then
git pull origin master
git push origin master --quiet
fi
cd ..

View File

@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
versionSpec: '8.x'
versionSpec: '10.x'
- script: |
choco install jq
displayName: 'install jq from choco'
@@ -20,6 +20,7 @@ steps:
$LATEST_MS_TAG="$(git -C vscode describe --tags)"
Write-Host "##vso[task.setvariable variable=LATEST_MS_TAG]$LATEST_MS_TAG"
Write-Host "##vso[task.setvariable variable=LATEST_MS_COMMIT]$LATEST_MS_COMMIT"
Write-Host "##vso[task.setvariable variable=BUILD_SOURCEVERSION]$LATEST_MS_COMMIT"
displayName: 'set env LATEST_MS_TAG, LATEST_MS_COMMIT'
- task: PowerShell@2
inputs: