aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-08-06 09:47:35 +0200
committerChocobozzz <me@florianbigard.com>2020-08-06 09:47:46 +0200
commitfc3b14e413e45fa239bce359a5648644afaf4c4c (patch)
tree95142b6c60513f1997f466786cdf9993db0f5bb8
parentd632a147293b36e46549a3ead754ef52d8fea735 (diff)
downloadPeerTube-fc3b14e413e45fa239bce359a5648644afaf4c4c.tar.gz
PeerTube-fc3b14e413e45fa239bce359a5648644afaf4c4c.tar.zst
PeerTube-fc3b14e413e45fa239bce359a5648644afaf4c4c.zip
Limit github actions on PR
-rw-r--r--.github/workflows/bundlewatch.yml3
-rw-r--r--.github/workflows/test.yml4
-rwxr-xr-xscripts/build/client.sh4
3 files changed, 9 insertions, 2 deletions
diff --git a/.github/workflows/bundlewatch.yml b/.github/workflows/bundlewatch.yml
index 94536c74e..312bf6e64 100644
--- a/.github/workflows/bundlewatch.yml
+++ b/.github/workflows/bundlewatch.yml
@@ -34,7 +34,8 @@ jobs:
34 - name: Install dependencies 34 - name: Install dependencies
35 run: yarn install --frozen-lockfile 35 run: yarn install --frozen-lockfile
36 36
37 - uses: jackyef/bundlewatch-gh-action@master 37 - name: Angular bundlewatch
38 uses: jackyef/bundlewatch-gh-action@master
38 with: 39 with:
39 build-script: npm run build -- --analyze-bundle 40 build-script: npm run build -- --analyze-bundle
40 bundlewatch-github-token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }} 41 bundlewatch-github-token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 03b925701..6edf3bf8c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,7 +2,11 @@ name: Test Suite
2 2
3on: 3on:
4 push: 4 push:
5 branches:
6 - develop
7 - master
5 pull_request: 8 pull_request:
9 types: [synchronize, opened]
6 schedule: 10 schedule:
7 - cron: '0 3 * * 1-5' 11 - cron: '0 3 * * 1-5'
8 12
diff --git a/scripts/build/client.sh b/scripts/build/client.sh
index 75da6765c..b2c2e3bfb 100755
--- a/scripts/build/client.sh
+++ b/scripts/build/client.sh
@@ -154,7 +154,9 @@ if [ -z ${1+x} ] || ([ "$1" != "--light" ] && [ "$1" != "--analyze-bundle" ]); t
154 done 154 done
155fi 155fi
156 156
157cd ../ && npm run build:embed && cd client/ 157if [ ! -z ${1+x} ] && [ "$1" == "--analyze-bundle" ]; then
158 cd ../ && npm run build:embed && cd client/
159fi
158 160
159# Copy runtime locales 161# Copy runtime locales
160cp -r "./src/locale" "./dist/locale" 162cp -r "./src/locale" "./dist/locale"