diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 1c1111f7b..3dad74ae6 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,7 +5,7 @@ > Every PR must have a linked issue > that a maintainer has reviewed and approved **before you started writing code**. > PRs that don't meet this requirement will not be reviewed. -> See [CONTRIBUTING.md](https://github.com/element-hq/element-call/blob/livekit/CONTRIBUTING.md) for ElementCall decided for this approach. +> See [CONTRIBUTING.md](https://github.com/element-hq/element-call/blob/main/CONTRIBUTING.md) for ElementCall decided for this approach. ## Content @@ -39,7 +39,7 @@ Uncomment the markdown table below and fill in the last line: ## Checklist - [ ] A linked, pre-approved issue exists for this feature or UI change. -- [ ] I have read [CONTRIBUTING.md](https://github.com/element-hq/element-call/blob/livekit/CONTRIBUTING.md) in full. +- [ ] I have read [CONTRIBUTING.md](https://github.com/element-hq/element-call/blob/main/CONTRIBUTING.md) in full. - [ ] Pull request includes screenshots or videos for any UI changes. - [ ] Tests written for new code (and existing touched code where feasible). - [ ] Linter and other CI checks pass. diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ba7cde513..3fe10723d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -6,7 +6,7 @@ on: - opened - labeled push: - branches: [livekit, full-mesh] + branches: [main] jobs: build_full_element_call: # Use the full package vite build @@ -22,8 +22,8 @@ jobs: SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} deploy_develop: - # Deploy livekit branch to call.element.dev after build completes - if: github.ref == 'refs/heads/livekit' + # Deploy main branch to call.element.dev after build completes + if: github.ref == 'refs/heads/main' needs: build_full_element_call runs-on: ubuntu-latest steps: @@ -43,8 +43,8 @@ jobs: } }) docker_for_develop: - # Build docker and publish docker for livekit branch after build completes - if: github.ref == 'refs/heads/livekit' + # Build docker and publish docker for main branch after build completes + if: github.ref == 'refs/heads/main' needs: build_full_element_call permissions: contents: write