Move CI on develop

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 5c0c93886d4100efc8ee40c8cc16ba22aa3e273b..8764cdd0e0e6e774857fbdde9822e79178c55e76 100644 (file)
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -14,9 +14,6 @@ name: "CodeQL"
 on:
   push:
     branches: [ develop, next ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ next ]
   schedule:
     - cron: '36 9 * * 5'
 

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index b4ff1a4525cfa6d0bafdc0bece90c8244dc5956d..7afe641b308562fa8ccffbb3e581bc7335aa7c45 100644 (file)
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -24,9 +24,9 @@ jobs:
           # FIXME: https://github.com/actions/checkout/issues/290
           git fetch --force --tags
 
-          one="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube-test:develop-bullseye\" }"
-          two="{ \"file\": \"./support/docker/production/Dockerfile.buster\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-test:production-buster,chocobozzz/peertube-test:$(git describe --abbrev=0)-buster\" }"
-          three="{ \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver-test:latest\" }"
+          one="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bullseye\" }"
+          two="{ \"file\": \"./support/docker/production/Dockerfile.buster\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-buster,chocobozzz/peertube:$(git describe --abbrev=0)-buster\" }"
+          three="{ \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver:latest\" }"
 
           matrix="[$one,$two,$three]"
           echo ::set-output name=matrix::{\"include\":$(echo $matrix)}

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 156b7143a52b6bfbd64f6ce07249081e296f2616..23898b7ef764b559121f19adc302cb4aba2ecf07 100644 (file)
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -1,9 +1,6 @@
 name: Nightly
 
 on:
-  push:
-    branches:
-      - 'next'
   schedule:
     - cron: '0 3 * * *'
 
@@ -17,7 +14,7 @@ jobs:
         name: Checkout develop
         uses: actions/checkout@v2
         with:
-          ref: next
+          ref: develop
 
       - uses: './.github/actions/reusable-prepare-peertube-build'
         with:
@@ -29,7 +26,7 @@ jobs:
       - uses: './.github/actions/reusable-deploy'
         with:
           source: ./peertube-nightly-*
-          destination: nightly-test
+          destination: nightly
           knownHosts: ${{ secrets.STATS_DEPLOYEMENT_KNOWN_HOSTS }}
           deployKey: ${{ secrets.STATS_DEPLOYEMENT_KEY }}
           deployUser: ${{ secrets.STATS_DEPLOYEMENT_USER }}