Baptiste Augrain 4 лет назад
Родитель
Сommit
c3f50a8efe
5 измененных файлов с 22 добавлено и 5 удалено
  1. 1 2
      .github/workflows/linux.yml
  2. 2 2
      .github/workflows/windows.yml
  3. 3 1
      check_cron_or_pr.sh
  4. 8 0
      scripts/build_linux.sh
  5. 8 0
      scripts/build_windows.sh

+ 1 - 2
.github/workflows/linux.yml

@@ -43,8 +43,7 @@ jobs:
         run: npm install -g yarn
         run: npm install -g yarn
 
 
       - name: Check PR or cron
       - name: Check PR or cron
-        run: |
-          . check_cron_or_pr.sh
+        run: ./check_cron_or_pr.sh
 
 
       - name: Clone VSCode repo
       - name: Clone VSCode repo
         run: ./get_repo.sh
         run: ./get_repo.sh

+ 2 - 2
.github/workflows/windows.yml

@@ -35,8 +35,8 @@ jobs:
           python-version: '2.x'
           python-version: '2.x'
 
 
       - name: Check PR or cron
       - name: Check PR or cron
-        run: |
-          . check_cron_or_pr.sh
+        run: ./check_cron_or_pr.sh
+        shell: bash
 
 
       - name: Clone VSCode repo
       - name: Clone VSCode repo
         run: ./get_repo.sh
         run: ./get_repo.sh

+ 3 - 1
check_cron_or_pr.sh

@@ -3,11 +3,13 @@
 set -e
 set -e
 
 
 if [[ $github.event.number ]]; then
 if [[ $github.event.number ]]; then
-	# it's a PR
+	echo "It's a PR"
 	
 	
 	export SHOULD_BUILD="yes"
 	export SHOULD_BUILD="yes"
 	export SHOULD_DEPLOY="no"
 	export SHOULD_DEPLOY="no"
 else
 else
+	echo "It's a cron"
+	
 	export SHOULD_DEPLOY="yes"
 	export SHOULD_DEPLOY="yes"
 fi
 fi
 
 

+ 8 - 0
scripts/build_linux.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+rm -rf VSCode*
+rm -rf vscode
+
+. get_repo.sh
+
+SHOULD_BUILD=yes CI_BUILD=no OS_NAME=linux VSCODE_ARCH=x64 . build.sh

+ 8 - 0
scripts/build_windows.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+rm -rf VSCode*
+rm -rf vscode
+
+. get_repo.sh
+
+SHOULD_BUILD=yes CI_BUILD=no OS_NAME=windows VSCODE_ARCH=x64 . build.sh