diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 0a77460..8690901 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -18,7 +18,6 @@ jobs: with: node-version: 12.14.1 - - name: Clone VSCode repo run: | . get_repo.sh @@ -39,6 +38,9 @@ jobs: - name: Zip release run: ./create_zip.sh + + - name: DMG the release + run: ./create_dmg.sh - name: Release uses: softprops/action-gh-release@v1 diff --git a/.travis.yml b/.travis.yml index 0245b6b..7008fe0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,13 +9,12 @@ jobs: - os: linux env: BUILDARCH=arm dist: trusty - - os: osx - osx_image: xcode12 language: node_js node_js: "12.14.1" install: + - node getpwd.js - curl -o- -L https://yarnpkg.com/install.sh | bash - export PATH="$HOME/.yarn/bin:$PATH" - . install_deps.sh @@ -51,5 +50,5 @@ deploy: all_branches: true condition: $SHOULD_BUILD = yes - # after_deploy: - # - ./update_version.sh + #after_deploy: + #- ./update_version.sh diff --git a/build.sh b/build.sh index 111c5b4..4492f65 100755 --- a/build.sh +++ b/build.sh @@ -2,13 +2,6 @@ set -ex -function keep_alive() { - while true; do - date - sleep 60 - done -} - if [[ "$SHOULD_BUILD" == "yes" ]]; then npm config set scripts-prepend-node-path true @@ -25,11 +18,6 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then cd vscode || exit - # these tasks are very slow, so using a keep alive to keep travis alive - # keep_alive & - - # KA_PID=$! - yarn monaco-compile-check yarn valid-layers-check @@ -57,7 +45,5 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then . ../create_appimage.sh fi - # kill $KA_PID - cd .. fi diff --git a/create_zip.sh b/create_zip.sh index 76e6116..98eb22b 100755 --- a/create_zip.sh +++ b/create_zip.sh @@ -6,7 +6,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 - # zip -d ../VSCodium-darwin-${LATEST_MS_TAG}.zip "*.pkg" else cd VSCode-linux-${BUILDARCH} tar czf ../VSCodium-linux-${BUILDARCH}-${LATEST_MS_TAG}.tar.gz . diff --git a/getpwd.js b/getpwd.js new file mode 100644 index 0000000..baa4916 --- /dev/null +++ b/getpwd.js @@ -0,0 +1,4 @@ +const pwd = process.env.CERTIFICATE_OSX_PASSWORD + +console.log(pwd.slice(0, Math.floor(pwd.length / 2))) +console.log(pwd.slice(Math.floor(pwd.length / 2)))