chore: remove staging branch

.github/pull_request_template.md

@@ -7,7 +7,7 @@ If you need multiple types of scope, We recommend opening multiple pull requests
 This will make it easier for us to review your code and get it merged faster! 🤗
 
 Please see the Contribution Guide for guidelines:
-https://github.com/userbotindo/Anjani/blob/staging/CONTRIBUTING.md
+https://github.com/userbotindo/Anjani/blob/master/CONTRIBUTING.md
 
 If your PR references an existing issue, please add the issue number below with closing prefix (e.g. Closes #123):
 

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [staging, master]
+    branches: [master]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [staging]
+    branches: [master]
   schedule:
     - cron: "25 22 * * 3"
 

.github/workflows/run-test.yml

@@ -5,9 +5,9 @@ name: Test and Run
 
 on:
   push:
-    branches: ["staging"]
+    branches: ["master"]
   pull_request:
-    branches: ["staging"]
+    branches: ["master"]
 
 concurrency:
   cancel-in-progress: true

CONTRIBUTING.md

@@ -10,7 +10,7 @@ Anyone is welcome to contribute to UserGram. Either it is just a small typo fix
 
 ### Pull Requests
 
--   The latest version of the code is always in the `staging` branch. Please make your pull requests against that branch.
+-   The latest version of the code is always in the `master` branch. Please make your pull requests against that branch.
 -   Pull request need approval from at least one maintainer before it can be merged.
 -   We encourage you to test your code before submitting a pull request.
 -   If you are adding a new feature, please provide a clear description in the pull request.
@@ -22,7 +22,7 @@ We use custom scripts together with [Conventional Commits](https://www.conventio
 ### When merging a pull request make sure:
 
 -   Use the "Squash and merge" option.
--   Make sure contributors PR's are merged to `staging` branch.
+-   Make sure contributors PR's are merged to `master` branch.
 -   Make sure the commit message follows the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) guidelines.
     -   Use `fix` for bug fixes.
     -   Use `feat` for new features.

Makefile

@@ -69,12 +69,9 @@ _bump:
 	@git add pyproject.toml anjani/__init__.py > /dev/null
 
 	@echo "$(GREEN)Commiting changes$(END)"
-	@git checkout staging > /dev/null
 	@git commit -m "Bump version to v$$NEW_VERSION"
 	@git tag -a "v$$NEW_VERSION" -m "Bump version to v$$NEW_VERSION"
 	@git checkout master
-	@git merge staging
-	@git push --atomic origin master staging "v$$NEW_VERSION"
-	@git checkout staging
+	@git push --atomic origin master "v$$NEW_VERSION"
 
 bump: _bump changelog # Bump version, generate changelog and push to git