From 0f6cfd5989769c3351f83b16326d0dffc59f0df3 Mon Sep 17 00:00:00 2001 From: Peter Bittner Date: Wed, 29 May 2019 08:36:16 +0200 Subject: [PATCH 1/5] Launch the IDE with codium (instead of vscodium) --- VSCodium-AppImage-Recipe.yml | 4 ++-- build.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VSCodium-AppImage-Recipe.yml b/VSCodium-AppImage-Recipe.yml index d463135..3eae2b4 100644 --- a/VSCodium-AppImage-Recipe.yml +++ b/VSCodium-AppImage-Recipe.yml @@ -12,7 +12,7 @@ ingredients: - code - libgconf2-4 dist: trusty - sources: + sources: - deb http://archive.ubuntu.com/ubuntu/ trusty main universe script: - pwd @@ -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/vscodium . ) + - ( cd usr/bin/ ; ln -s ../share/vscodium/codium . ) diff --git a/build.sh b/build.sh index 5513455..6513de5 100755 --- a/build.sh +++ b/build.sh @@ -21,7 +21,7 @@ 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")' - applicationName='setpath(["applicationName"]; "vscodium")' + applicationName='setpath(["applicationName"]; "codium")' win32MutexName='setpath(["win32MutexName"]; "vscodium")' win32DirName='setpath(["win32DirName"]; "VSCodium")' win32NameVersion='setpath(["win32NameVersion"]; "VSCodium")' From 02f69839a7db1e6add37103713a5896752e877dd Mon Sep 17 00:00:00 2001 From: Peter Squicciarini Date: Fri, 31 May 2019 08:42:51 -0700 Subject: [PATCH 2/5] Update README.md Update Mojave instructions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 26815ef..f84504c 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ If you are on a Mac and have [Homebrew](https://brew.sh/) installed: brew cask install vscodium ``` -_Note: if you see "App can’t be opened because it is from an unidentified developer" when opening VSCodium the first time, you can right-click the application and choose Open. This should only be required the first time opening on a Mac._ +_Note for Mac OS X Mojave users: if you see "App can't be opened because Apple cannot check it for malicious software" when opening VSCodium the first time, you can right-click the application and choose Open. This should only be required the first time opening on Mojave._ #### Install with Chocolatey (Windows) If you use Windows and have [Chocolatey](https://chocolatey.org) installed (thanks to [@Thilas](https://github.com/Thilas)): From 3f1e9ec9b4d8a7aed577ba835a5014de1d028c49 Mon Sep 17 00:00:00 2001 From: Peter Squicciarini Date: Thu, 6 Jun 2019 16:22:04 -0700 Subject: [PATCH 3/5] Upgrade to Node 10 --- .travis.yml | 2 +- win32-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 812ebbc..8344398 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ matrix: - os: osx language: node_js -node_js: "8" +node_js: "10" before_install: - curl -o- -L https://yarnpkg.com/install.sh | bash diff --git a/win32-build.yml b/win32-build.yml index fc3538e..fc560f0 100644 --- a/win32-build.yml +++ b/win32-build.yml @@ -1,7 +1,7 @@ steps: - task: NodeTool@0 inputs: - versionSpec: '8.x' + versionSpec: '10.x' - script: | choco install jq displayName: 'install jq from choco' From c2b46ceb356c1cab93f43e69afc49084ff39f520 Mon Sep 17 00:00:00 2001 From: "Lorenzo \"Palinuro\" Faletra" Date: Sun, 9 Jun 2019 14:33:57 +0200 Subject: [PATCH 4/5] change vscodium to codium in debian postinst --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 6513de5..599ec33 100755 --- a/build.sh +++ b/build.sh @@ -44,7 +44,7 @@ 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 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then From b5a6849834f46bc81e8add0c8c248ba109eab7b6 Mon Sep 17 00:00:00 2001 From: Peter Squicciarini Date: Mon, 10 Jun 2019 21:35:15 -0700 Subject: [PATCH 5/5] Add retry logic to git push --- update_version.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/update_version.sh b/update_version.sh index af59f41..f069c74 100755 --- a/update_version.sh +++ b/update_version.sh @@ -136,6 +136,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 ..