浏览代码

CI: Install Packages and use the full version

Colin Edwards 8 年之前
父节点
当前提交
e1496ecff9
共有 2 个文件被更改,包括 4 次插入6 次删除
  1. 1 6
      CI/before-deploy-osx.sh
  2. 3 0
      CI/install-dependencies-osx.sh

+ 1 - 6
CI/before-deploy-osx.sh

@@ -1,15 +1,10 @@
-curl -L -O https://s3-us-west-2.amazonaws.com/obs-nightly/packagesbuild
-chmod +x ./packagesbuild
-curl -L -O https://s3-us-west-2.amazonaws.com/obs-nightly/packagesutil
-chmod +x ./packagesutil
-
 export GIT_HASH=$(git rev-parse --short HEAD)
 export FILE_DATE=$(date +%Y-%m-%d.%H:%M:%S)
 export FILENAME=$FILE_DATE-$GIT_HASH-osx.pkg
 mkdir nightly
 cd ./build
 sudo python ../CI/install/osx/build_app.py
-../packagesbuild ../CI/install/osx/CMakeLists.pkgproj
+packagesbuild ../CI/install/osx/CMakeLists.pkgproj
 
 sudo cp OBS.pkg ./$FILENAME
 sudo mv ./$FILENAME ../nightly

+ 3 - 0
CI/install-dependencies-osx.sh

@@ -1,3 +1,6 @@
+curl -L -O https://s3-us-west-2.amazonaws.com/obs-nightly/Packages.pkg
+sudo installer -pkg ./Packages.pkg -target /
+
 brew update
 
 #Base OBS Deps