From d57bb5bb769d4af96185cb0663ef856fb3d5a927 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 26 Jun 2023 13:37:31 +0100
Subject: [PATCH] Fix branch names in CI

---
 .github/workflows/build.yaml                             | 2 +-
 .github/workflows/e2e.yml                                | 2 +-
 .../{netlify-main.yaml => netlify-fullmesh.yaml}         | 4 ++--
 .github/workflows/netlify-livekit.yaml                   | 9 ++++-----
 4 files changed, 8 insertions(+), 9 deletions(-)
 rename .github/workflows/{netlify-main.yaml => netlify-fullmesh.yaml} (97%)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index eaba813..345f8c9 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -2,7 +2,7 @@ name: Build
 on:
   pull_request: {}
   push:
-    branches: [main]
+    branches: [livekit]
 jobs:
   build:
     name: Build
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index ba1172d..b31bc54 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -5,7 +5,7 @@ on:
     types:
       - completed
     branches-ignore:
-      - "main"
+      - "livekit"
 jobs:
   e2e:
     name: E2E tests runs on Element Call
diff --git a/.github/workflows/netlify-main.yaml b/.github/workflows/netlify-fullmesh.yaml
similarity index 97%
rename from .github/workflows/netlify-main.yaml
rename to .github/workflows/netlify-fullmesh.yaml
index 5ba15a6..69bedf7 100644
--- a/.github/workflows/netlify-main.yaml
+++ b/.github/workflows/netlify-fullmesh.yaml
@@ -5,7 +5,7 @@ on:
     types:
       - completed
     branches:
-      - "main"
+      - "full-mesh"
 
 jobs:
   deploy:
@@ -16,7 +16,7 @@ jobs:
     # so we need to check the head repo too in order to not run on PRs from forks
     # We check the branch name again too just for completeness
     # (Is there a nicer way to see if a PR is from a fork?)
-    if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_repository.full_name == 'vector-im/element-call' && github.event.workflow_run.head_branch == 'main'
+    if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_repository.full_name == 'vector-im/element-call' && github.event.workflow_run.head_branch == 'full-mesh'
     steps:
       - name: Create Deployment
         uses: bobheadxi/deployments@v1
diff --git a/.github/workflows/netlify-livekit.yaml b/.github/workflows/netlify-livekit.yaml
index 42a08e1..f4463f9 100644
--- a/.github/workflows/netlify-livekit.yaml
+++ b/.github/workflows/netlify-livekit.yaml
@@ -1,11 +1,11 @@
-name: Netlify LiveKit Experiment
+name: Netlify LiveKit
 on:
   workflow_run:
     workflows: ["Build"]
     types:
       - completed
     branches:
-      - "livekit-experiment"
+      - "livekit"
 
 jobs:
   deploy:
@@ -16,7 +16,7 @@ jobs:
     # so we need to check the head repo too in order to not run on PRs from forks
     # We check the branch name again too just for completeness
     # (Is there a nicer way to see if a PR is from a fork?)
-    if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_repository.full_name == 'vector-im/element-call' && github.event.workflow_run.head_branch == 'livekit-experiment'
+    if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_repository.full_name == 'vector-im/element-call' && github.event.workflow_run.head_branch == 'livekit'
     steps:
       - name: Create Deployment
         uses: bobheadxi/deployments@v1
@@ -64,12 +64,11 @@ jobs:
         with:
           publish-dir: dist
           deploy-message: "Deploy from GitHub Actions"
-          production-branch: livekit-experiment
+          production-branch: livekit
           production-deploy: true
           # These don't work because we're in workflow_run
           enable-pull-request-comment: false
           enable-commit-comment: false
-          github-deployment-environment: livekit-experiment
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           NETLIFY_SITE_ID: e3b9fa82-c040-4db6-b4bf-42b524d57423