aboutsummaryrefslogtreecommitdiffhomepage
path: root/.github
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-12-03 10:24:33 +0100
committerChocobozzz <me@florianbigard.com>2021-12-03 10:24:33 +0100
commitbdb4cc80c3d90fccfe5ed2a0f1a4837882a46b8f (patch)
tree5059718836091dd2e6766e3837fb4880a7a787b3 /.github
parent63a3d336f6cc9a293a07fdc12d6bdfb86cfc2fd5 (diff)
downloadPeerTube-bdb4cc80c3d90fccfe5ed2a0f1a4837882a46b8f.tar.gz
PeerTube-bdb4cc80c3d90fccfe5ed2a0f1a4837882a46b8f.tar.zst
PeerTube-bdb4cc80c3d90fccfe5ed2a0f1a4837882a46b8f.zip
Move CI on develop
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/codeql.yml3
-rw-r--r--.github/workflows/docker.yml6
-rw-r--r--.github/workflows/nightly.yml7
3 files changed, 5 insertions, 11 deletions
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 5c0c93886..8764cdd0e 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -14,9 +14,6 @@ name: "CodeQL"
14on: 14on:
15 push: 15 push:
16 branches: [ develop, next ] 16 branches: [ develop, next ]
17 pull_request:
18 # The branches below must be a subset of the branches above
19 branches: [ next ]
20 schedule: 17 schedule:
21 - cron: '36 9 * * 5' 18 - cron: '36 9 * * 5'
22 19
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index b4ff1a452..7afe641b3 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -24,9 +24,9 @@ jobs:
24 # FIXME: https://github.com/actions/checkout/issues/290 24 # FIXME: https://github.com/actions/checkout/issues/290
25 git fetch --force --tags 25 git fetch --force --tags
26 26
27 one="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube-test:develop-bullseye\" }" 27 one="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bullseye\" }"
28 two="{ \"file\": \"./support/docker/production/Dockerfile.buster\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-test:production-buster,chocobozzz/peertube-test:$(git describe --abbrev=0)-buster\" }" 28 two="{ \"file\": \"./support/docker/production/Dockerfile.buster\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-buster,chocobozzz/peertube:$(git describe --abbrev=0)-buster\" }"
29 three="{ \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver-test:latest\" }" 29 three="{ \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver:latest\" }"
30 30
31 matrix="[$one,$two,$three]" 31 matrix="[$one,$two,$three]"
32 echo ::set-output name=matrix::{\"include\":$(echo $matrix)} 32 echo ::set-output name=matrix::{\"include\":$(echo $matrix)}
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 156b7143a..23898b7ef 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -1,9 +1,6 @@
1name: Nightly 1name: Nightly
2 2
3on: 3on:
4 push:
5 branches:
6 - 'next'
7 schedule: 4 schedule:
8 - cron: '0 3 * * *' 5 - cron: '0 3 * * *'
9 6
@@ -17,7 +14,7 @@ jobs:
17 name: Checkout develop 14 name: Checkout develop
18 uses: actions/checkout@v2 15 uses: actions/checkout@v2
19 with: 16 with:
20 ref: next 17 ref: develop
21 18
22 - uses: './.github/actions/reusable-prepare-peertube-build' 19 - uses: './.github/actions/reusable-prepare-peertube-build'
23 with: 20 with:
@@ -29,7 +26,7 @@ jobs:
29 - uses: './.github/actions/reusable-deploy' 26 - uses: './.github/actions/reusable-deploy'
30 with: 27 with:
31 source: ./peertube-nightly-* 28 source: ./peertube-nightly-*
32 destination: nightly-test 29 destination: nightly
33 knownHosts: ${{ secrets.STATS_DEPLOYEMENT_KNOWN_HOSTS }} 30 knownHosts: ${{ secrets.STATS_DEPLOYEMENT_KNOWN_HOSTS }}
34 deployKey: ${{ secrets.STATS_DEPLOYEMENT_KEY }} 31 deployKey: ${{ secrets.STATS_DEPLOYEMENT_KEY }}
35 deployUser: ${{ secrets.STATS_DEPLOYEMENT_USER }} 32 deployUser: ${{ secrets.STATS_DEPLOYEMENT_USER }}