From bdb4cc80c3d90fccfe5ed2a0f1a4837882a46b8f Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 3 Dec 2021 10:24:33 +0100
Subject: [PATCH] Move CI on develop

---
 .github/workflows/codeql.yml  | 3 ---
 .github/workflows/docker.yml  | 6 +++---
 .github/workflows/nightly.yml | 7 ++-----
 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"
 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 b4ff1a452..7afe641b3 100644
--- 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 156b7143a..23898b7ef 100644
--- 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 }}