浏览代码

(experiment) Use npx for create-dmg

Peter Squicciarini 4 年之前
父节点
当前提交
1435710c16
共有 4 个文件被更改,包括 7 次插入6 次删除
  1. 5 0
      .travis.yml
  2. 0 1
      build.sh
  3. 1 1
      create_dmg.sh
  4. 1 4
      install_deps.sh

+ 5 - 0
.travis.yml

@@ -13,6 +13,11 @@ matrix:
       env: BUILDARCH=arm
       env: BUILDARCH=arm
       dist: trusty
       dist: trusty
     - os: osx
     - os: osx
+      addons:
+        homebrew:
+          packages:
+            - jq
+            - zip
 
 
 language: node_js
 language: node_js
 node_js: "12.14.1"
 node_js: "12.14.1"

+ 0 - 1
build.sh

@@ -34,7 +34,6 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   yarn gulp minify-vscode
   yarn gulp minify-vscode
 
 
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    npm install --global create-dmg
     yarn gulp vscode-darwin-min-ci
     yarn gulp vscode-darwin-min-ci
   elif [[ "$CI_WINDOWS" == "True" ]]; then
   elif [[ "$CI_WINDOWS" == "True" ]]; then
     cp LICENSE.txt LICENSE.rtf # windows build expects rtf license
     cp LICENSE.txt LICENSE.rtf # windows build expects rtf license

+ 1 - 1
create_dmg.sh

@@ -2,7 +2,7 @@
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     cd VSCode-darwin
     cd VSCode-darwin
-    create-dmg VSCodium.app ..
+    npx create-dmg VSCodium.app ..
     mv "../VSCodium ${LATEST_MS_TAG}.dmg" "../VSCodium.${LATEST_MS_TAG}.dmg"
     mv "../VSCodium ${LATEST_MS_TAG}.dmg" "../VSCodium.${LATEST_MS_TAG}.dmg"
   fi
   fi
   cd ..
   cd ..

+ 1 - 4
install_deps.sh

@@ -1,9 +1,6 @@
 #!/bin/bash
 #!/bin/bash
 
 
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-  brew update
-  brew install jq zip
-else
+if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then
   sudo apt-get update
   sudo apt-get update
   sudo apt-get install -y fakeroot jq
   sudo apt-get install -y fakeroot jq
   triplet=
   triplet=