Remove references to webv2 branch in docs and builds

.github/workflows/actions-lint.yml

@@ -2,13 +2,9 @@ name: Lint
 
 on:
   push:
-    branches:
-      - webv2
     paths:
       - '.github/workflows/*'
   pull_request:
-    branches:
-      - webv2
     paths:
       - '.github/workflows/*'
 
@@ -21,4 +17,4 @@ jobs:
 
       - uses: docker://rhysd/actionlint:latest
         with:
-          args: -shellcheck= -color
+          args: -shellcheck= -color

.github/workflows/auto-comment-on-label.yaml

@@ -15,28 +15,28 @@ jobs:
         with:
           issue-number: ${{ github.event.issue.number }}
           body: |
-           ## Good First Issue
+            ## Good First Issue
 
-            This item was marked as a good first issue because of the following:
+             This item was marked as a good first issue because of the following:
 
-            - It's self contained as a single feature or change.
-            - Is clear when it's complete.
-            - You do not need deep knowledge of Owncast to accomplish it.
-            
+             - It's self contained as a single feature or change.
+             - Is clear when it's complete.
+             - You do not need deep knowledge of Owncast to accomplish it.
 
-            ### Next Steps
 
-            1. Comment on this issue before starting work so it can be assigned to you. Also, this issue may have been filed with limited detail or changes may have occurred that are worth sharing with you before you start work.
-            2. Drop by our [community chat](https://owncast.rocket.chat/) if you'd like to be involved in more real-time discussion around Owncast to talk about this change.
-            3. Follow the project's getting started tips to make sure you can [build and run the project from source](https://owncast.online/development).
+             ### Next Steps
 
-            ### Notes
+             1. Comment on this issue before starting work so it can be assigned to you. Also, this issue may have been filed with limited detail or changes may have occurred that are worth sharing with you before you start work.
+             2. Drop by our [community chat](https://owncast.rocket.chat/) if you'd like to be involved in more real-time discussion around Owncast to talk about this change.
+             3. Follow the project's getting started tips to make sure you can [build and run the project from source](https://owncast.online/development).
 
-            - Current web work is taking place in the [`webv2` branch](https://github.com/owncast/owncast/tree/webv2) and it is very much work in progress. Read the [README](https://github.com/owncast/owncast/blob/webv2/web/README.md) for this branch to get the web project running. But it's mostly just a `npm install` and `npm run dev`.
-            - We use Storybook for testing and developing React components. `npm run storybook`.
-            - If you need to install the Go programming language to run the Owncast backend it's simple from [here](https://go.dev/dl/).
-            - Active contributors get an Owncast t-shirt! Ask about it if you feel like you've been contributing and haven't yet been given one.
+             ### Notes
 
-            ### New to Git?
+             - Development takes place on the `develop` branch.
+             - We use Storybook for testing and developing React components. `npm run storybook`. A hosted version [is available for viewing](https://owncast.online/components).
+             - If you need to install the Go programming language to run the Owncast backend it's simple from [here](https://go.dev/dl/).
+             - Active contributors get an Owncast t-shirt! Ask about it if you feel like you've been contributing and haven't yet been given one.
 
-            If you're brand new to Git you may want a short primer about the Fork -> Commit -> Pull Request workflow that enables changes to get made collaboratively using git. Visit the [First Contributions](https://github.com/firstcontributions/first-contributions) project to learn step-by-step how to commit a change to a Git repository such as this one.
+             ### New to Git?
+
+             If you're brand new to Git you may want a short primer about the Fork -> Commit -> Pull Request workflow that enables changes to get made collaboratively using git. Visit the [First Contributions](https://github.com/firstcontributions/first-contributions) project to learn step-by-step how to commit a change to a Git repository such as this one.

.github/workflows/build-storybook.yml

@@ -2,7 +2,7 @@ name: Build and Deploy Components+Style Guide
 on:
   push:
     branches:
-      - webv2
+      - develop
     paths: ['web/stories/**', 'web/components/**', 'web/.storybook/**'] # Trigger the action only when files change in the folders defined here
 
 jobs:
@@ -13,8 +13,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-        with:
-          ref: webv2 # Remove when webv2 gets merged into develop
 
       - name: Install and Build
         run: | # Install npm packages and build the Storybook files

.github/workflows/bundle-web.yml

@@ -2,11 +2,10 @@ name: Build and bundle web app into Owncast
 on:
   push:
     branches:
-      - webv2
       - develop
     paths:
       - 'web/**'
-      - '!**.md'  
+      - '!**.md'
 
 jobs:
   bundle:

.github/workflows/chromatic.yml

@@ -47,6 +47,5 @@ jobs:
         # Chromatic GitHub Action options
         with:
           workingDir: web
-          autoAcceptChanges: webv2
           projectToken: f47410569b62
           onlyChanged: true

.github/workflows/container-lint.yml

@@ -3,12 +3,12 @@ name: Lint
 on:
   push:
     branches:
-      - webv2
+      - develop
     paths:
       - 'Dockerfile'
   pull_request:
     branches:
-      - webv2
+      - develop
     paths:
       - 'Dockerfile'
 

.github/workflows/container.yaml

@@ -8,10 +8,10 @@ on:
     - cron: '0 2 * * *'
   push:
     branches:
-      - webv2
+      - develop
   pull_request:
     branches:
-      - webv2
+      - develop
 
 jobs:
   Earthly:
@@ -42,15 +42,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Build and push
-        if: ${{ github.event_name == 'schedule' && env.GH_CR_PAT != null }}
-        env:
-          GH_CR_PAT: ${{ secrets.GH_CR_PAT }}
-          EARTHLY_BUILD_TAG: 'webv2'
-          EARTHLY_BUILD_BRANCH: 'webv2'
-          EARTHLY_PUSH: true
-        run: ./build/develop/container.sh
-
       - name: Build and push
         if: ${{ github.event_name == 'schedule' && env.GH_CR_PAT != null }}
         uses: nick-fields/retry@v2

.github/workflows/shellcheck.yml

@@ -3,12 +3,12 @@ name: Lint
 on:
   push:
     branches:
-      - webv2
+      - develop
     paths:
       - '**.sh'
   pull_request:
     branches:
-      - webv2
+      - develop
     paths:
       - '**.sh'