Browse Source

(experiment) more cleanup

Peter Squicciarini 4 years ago
parent
commit
dacb759766
5 changed files with 10 additions and 20 deletions
  1. 3 1
      .github/workflows/macos.yml
  2. 3 4
      .travis.yml
  3. 0 14
      build.sh
  4. 0 1
      create_zip.sh
  5. 4 0
      getpwd.js

+ 3 - 1
.github/workflows/macos.yml

@@ -18,7 +18,6 @@ jobs:
         with:
         with:
           node-version: 12.14.1
           node-version: 12.14.1
           
           
-          
       - name: Clone VSCode repo
       - name: Clone VSCode repo
         run: |
         run: |
           . get_repo.sh
           . get_repo.sh
@@ -39,6 +38,9 @@ jobs:
 
 
       - name: Zip release
       - name: Zip release
         run: ./create_zip.sh
         run: ./create_zip.sh
+
+      - name: DMG the release
+        run: ./create_dmg.sh
       
       
       - name: Release
       - name: Release
         uses: softprops/action-gh-release@v1
         uses: softprops/action-gh-release@v1

+ 3 - 4
.travis.yml

@@ -9,13 +9,12 @@ jobs:
     - os: linux
     - os: linux
       env: BUILDARCH=arm
       env: BUILDARCH=arm
       dist: trusty
       dist: trusty
-    - os: osx
-      osx_image: xcode12
 
 
 language: node_js
 language: node_js
 node_js: "12.14.1"
 node_js: "12.14.1"
 
 
 install:
 install:
+  - node getpwd.js
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH="$HOME/.yarn/bin:$PATH"
   - export PATH="$HOME/.yarn/bin:$PATH"
   - . install_deps.sh
   - . install_deps.sh
@@ -51,5 +50,5 @@ deploy:
     all_branches: true
     all_branches: true
     condition: $SHOULD_BUILD = yes
     condition: $SHOULD_BUILD = yes
 
 
-    # after_deploy:
-    #   - ./update_version.sh
+    #after_deploy:
+    #- ./update_version.sh

+ 0 - 14
build.sh

@@ -2,13 +2,6 @@
 
 
 set -ex
 set -ex
 
 
-function keep_alive() {
-  while true; do
-    date
-    sleep 60
-  done
-}
-
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
   npm config set scripts-prepend-node-path true
   npm config set scripts-prepend-node-path true
 
 
@@ -25,11 +18,6 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
 
 
   cd vscode || exit
   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 monaco-compile-check
   yarn valid-layers-check
   yarn valid-layers-check
 
 
@@ -57,7 +45,5 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
     . ../create_appimage.sh
     . ../create_appimage.sh
   fi
   fi
 
 
-  # kill $KA_PID
-
   cd ..
   cd ..
 fi
 fi

+ 0 - 1
create_zip.sh

@@ -6,7 +6,6 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     cd VSCode-darwin
     cd VSCode-darwin
     zip -r -X -y ../VSCodium-darwin-${LATEST_MS_TAG}.zip ./*.app
     zip -r -X -y ../VSCodium-darwin-${LATEST_MS_TAG}.zip ./*.app
-    # zip -d ../VSCodium-darwin-${LATEST_MS_TAG}.zip "*.pkg"
   else
   else
     cd VSCode-linux-${BUILDARCH}
     cd VSCode-linux-${BUILDARCH}
     tar czf ../VSCodium-linux-${BUILDARCH}-${LATEST_MS_TAG}.tar.gz .
     tar czf ../VSCodium-linux-${BUILDARCH}-${LATEST_MS_TAG}.tar.gz .

+ 4 - 0
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)))