Merge branch 'main' into master

6 files changed, 17 insertions, 17 deletions

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7217cb443..1df05e990 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,14 +4,15 @@
 **/bot/exts/moderation/*silence.py      @MarkKoz
 bot/exts/info/codeblock/**              @MarkKoz
 bot/exts/utils/extensions.py            @MarkKoz
-bot/exts/utils/snekbox.py               @MarkKoz @Akarys42
+bot/exts/utils/snekbox.py               @MarkKoz @Akarys42 @jb3
 bot/exts/help_channels/**               @MarkKoz @Akarys42
-bot/exts/moderation/**                  @Akarys42 @mbaruh @Den4200 @ks129
-bot/exts/info/**                        @Akarys42 @Den4200
-bot/exts/info/information.py            @mbaruh
-bot/exts/filters/**                     @mbaruh
+bot/exts/moderation/**                  @Akarys42 @mbaruh @Den4200 @ks129 @jb3
+bot/exts/info/**                        @Akarys42 @Den4200 @jb3
+bot/exts/info/information.py            @mbaruh @jb3
+bot/exts/filters/**                     @mbaruh @jb3
 bot/exts/fun/**                         @ks129
-bot/exts/utils/**                       @ks129
+bot/exts/utils/**                       @ks129 @jb3
+bot/exts/recruitment/**                 @wookie184
 
 # Rules
 bot/rules/**                            @mbaruh
@@ -29,9 +30,9 @@ tests/bot/exts/test_cogs.py             @MarkKoz
 tests/**                                @Akarys42
 
 # CI & Docker
-.github/workflows/**                    @MarkKoz @Akarys42 @SebastiaanZ @Den4200
-Dockerfile                              @MarkKoz @Akarys42 @Den4200
-docker-compose.yml                      @MarkKoz @Akarys42 @Den4200
+.github/workflows/**                    @MarkKoz @Akarys42 @SebastiaanZ @Den4200 @jb3
+Dockerfile                              @MarkKoz @Akarys42 @Den4200 @jb3
+docker-compose.yml                      @MarkKoz @Akarys42 @Den4200 @jb3
 
 # Tools
 Pipfile*                                @Akarys42
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index 6d9919ef2..000000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-patreon: python_discord
-custom: https://www.redbubble.com/people/pythondiscord
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c97e8784..84a671917 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on:
   workflow_run:
     workflows: ["Lint & Test"]
     branches:
-      - master
+      - main
     types:
       - completed
 
@@ -39,7 +39,7 @@ jobs:
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.GHCR_TOKEN  }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
 
       # Build and push the container to the GitHub Container
       # Repository. The container will be tagged as "latest"
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5a4aede30..8b809b777 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,12 +4,13 @@ on:
   workflow_run:
     workflows: ["Build"]
     branches:
-      - master
+      - main
     types:
       - completed
 
 jobs:
   build:
+    environment: production
     if: github.event.workflow_run.conclusion == 'success'
     name: Build & Push
     runs-on: ubuntu-latest
diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
index 6fa8e8333..95bed2e14 100644
--- a/.github/workflows/lint-test.yml
+++ b/.github/workflows/lint-test.yml
@@ -3,7 +3,7 @@ name: Lint & Test
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 
 
diff --git a/.github/workflows/sentry_release.yml b/.github/workflows/sentry_release.yml
index b8d92e90a..f6a1e1f0e 100644
--- a/.github/workflows/sentry_release.yml
+++ b/.github/workflows/sentry_release.yml
@@ -3,14 +3,14 @@ name: Create Sentry release
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   create_sentry_release:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@master
+        uses: actions/checkout@main
 
       - name: Create a Sentry.io release
         uses: tclindner/[email protected]