Skip to content

Commit 9014fff

Browse files
committed
Change all references of master to main
1 parent 94bcee2 commit 9014fff

6 files changed

Lines changed: 37 additions & 37 deletions

File tree

.github/SETUP.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,18 @@ After adding the secret, the workflow will automatically:
3939
- Authenticate to AWS using OIDC (no credentials stored)
4040
- Build Docker images for ARM64 platform
4141
- Push to ECR with appropriate tags:
42-
- `:staging` for non-master branches
43-
- `:prod` for master branch (after CI passes)
42+
- `:staging` for non-main branches
43+
- `:prod` for main branch (after CI passes)
4444

4545
## Testing
4646

4747
To test the setup:
4848

49-
1. **Test staging build**: Push to any branch except `master`
49+
1. **Test staging build**: Push to any branch except `main`
5050
- Should trigger Docker build and push to `:staging` tag
5151
- Check ECR repository to verify image was pushed
5252

53-
2. **Test production build**: Merge to `master` branch
53+
2. **Test production build**: Merge to `main` branch
5454
- Should run lint, test, security checks first
5555
- If all pass, should build and push to `:prod` tag
5656
- Check ECR repository to verify image was pushed

.github/workflows/ci.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CI
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66
pull_request:
7-
branches: [master]
7+
branches: [main]
88

99
env:
1010
POETRY_VERSION: "2.3.0"
@@ -14,8 +14,8 @@ jobs:
1414
lint:
1515
name: Lint
1616
runs-on: ubuntu-latest
17-
# Only run on master branch pushes and PRs to master
18-
if: github.event_name == 'pull_request' || github.ref == 'refs/heads/master'
17+
# Only run on main branch pushes and PRs to main
18+
if: github.event_name == 'pull_request' || github.ref == 'refs/heads/main'
1919
steps:
2020
- name: Checkout code
2121
uses: actions/checkout@v4
@@ -62,8 +62,8 @@ jobs:
6262
test:
6363
name: Test
6464
runs-on: ubuntu-latest
65-
# Only run on master branch pushes and PRs to master
66-
if: github.event_name == 'pull_request' || github.ref == 'refs/heads/master'
65+
# Only run on main branch pushes and PRs to main
66+
if: github.event_name == 'pull_request' || github.ref == 'refs/heads/main'
6767
steps:
6868
- name: Checkout code
6969
uses: actions/checkout@v4
@@ -125,8 +125,8 @@ jobs:
125125
security:
126126
name: Security Scan
127127
runs-on: ubuntu-latest
128-
# Only run on master branch pushes and PRs to master
129-
if: github.event_name == 'pull_request' || github.ref == 'refs/heads/master'
128+
# Only run on main branch pushes and PRs to main
129+
if: github.event_name == 'pull_request' || github.ref == 'refs/heads/main'
130130
steps:
131131
- name: Checkout code
132132
uses: actions/checkout@v4
@@ -173,9 +173,9 @@ jobs:
173173
docker-build-push:
174174
name: Build and Push Docker Image
175175
runs-on: ubuntu-latest
176-
# Run on push to master (build+push) and on PRs (build only)
176+
# Run on push to main (build+push) and on PRs (build only)
177177
if: github.event_name == 'push' || github.event_name == 'pull_request'
178-
# For master/PR, wait for CI checks to pass
178+
# For main/PR, wait for CI checks to pass
179179
needs: [ci-success]
180180
permissions:
181181
id-token: write # Required for OIDC authentication
@@ -232,7 +232,7 @@ jobs:
232232
- name: Determine Docker tag
233233
id: docker-tag
234234
run: |
235-
if [ "${{ github.ref }}" == "refs/heads/master" ]; then
235+
if [ "${{ github.ref }}" == "refs/heads/main" ]; then
236236
echo "image=633607774026.dkr.ecr.us-east-2.amazonaws.com/back-end:prod" >> $GITHUB_OUTPUT
237237
echo "environment=Production" >> $GITHUB_OUTPUT
238238
else
@@ -286,20 +286,20 @@ jobs:
286286
# Always run to satisfy docker-build-push dependency
287287
if: always()
288288
steps:
289-
- name: Check all jobs passed (master/PR only)
290-
if: github.event_name == 'pull_request' || github.ref == 'refs/heads/master'
289+
- name: Check all jobs passed (main/PR only)
290+
if: github.event_name == 'pull_request' || github.ref == 'refs/heads/main'
291291
run: |
292-
# Check if jobs were skipped (non-master) or failed
292+
# Check if jobs were skipped (non-main) or failed
293293
if [[ "${{ needs.lint.result }}" == "skipped" ]]; then
294-
echo "Lint job was skipped - this should not happen on master/PR"
294+
echo "Lint job was skipped - this should not happen on main/PR"
295295
exit 1
296296
fi
297297
if [[ "${{ needs.lint.result }}" != "success" ]]; then
298298
echo "Lint job failed"
299299
exit 1
300300
fi
301301
if [[ "${{ needs.test.result }}" == "skipped" ]]; then
302-
echo "Test job was skipped - this should not happen on master/PR"
302+
echo "Test job was skipped - this should not happen on main/PR"
303303
exit 1
304304
fi
305305
if [[ "${{ needs.test.result }}" != "success" ]]; then
@@ -308,7 +308,7 @@ jobs:
308308
fi
309309
# Security is informational, doesn't fail CI
310310
echo "All required jobs passed!"
311-
- name: Pass through for non-master branches
312-
if: github.event_name != 'pull_request' && github.ref != 'refs/heads/master'
311+
- name: Pass through for non-main branches
312+
if: github.event_name != 'pull_request' && github.ref != 'refs/heads/main'
313313
run: |
314-
echo "Skipping CI checks for non-master branch (staging build will proceed)"
314+
echo "Skipping CI checks for non-main branch (staging build will proceed)"

CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ High level overview of upcoming Operation Code goals. This is the source of upc
172172

173173
## Working On Your Issue
174174

175-
* Please first **read** Operation Code's [guidelines for working an issue](https://github.com/OperationCode/operationcode/blob/master/CONTRIBUTING.md#guidelines-for-working-an-issue)
175+
* Please first **read** Operation Code's [guidelines for working an issue](https://github.com/OperationCode/operationcode/blob/main/CONTRIBUTING.md#guidelines-for-working-an-issue)
176176

177177
* From the forked and cloned repository on your environment, you can now create a [feature branch](http://nvie.com/posts/a-successful-git-branching-model/). It is a good idea to name your branch after the issue it is attached to.
178178

@@ -188,10 +188,10 @@ git branch
188188

189189
* Once you have finished your work, head over to **Operation Code**'s main GitHub page, and make a pull request. More information about pull requests can be found in the next section.
190190

191-
* To return to your main `master` branch, type the following in the terminal:
191+
* To return to your main `main` branch, type the following in the terminal:
192192

193193
```bash
194-
git checkout master
194+
git checkout main
195195
```
196196

197197
</details>
@@ -202,10 +202,10 @@ git checkout master
202202
<summary>Click to Expand</summary>
203203
Some issues take awhile to code a solution for. It is very normal to take a large amount of time to turn in
204204
well-written work that resolves an issue! In the meantime, there could be many other people contributing to the
205-
code base. Since we use Git, you'll want to keep you project up-to-date with the `master` branch so there are no
205+
code base. Since we use Git, you'll want to keep you project up-to-date with the `main` branch so there are no
206206
[merge conflicts](https://help.github.com/articles/about-merge-conflicts/) to resolve when you make your pull request.
207207
<ol>
208-
<li> <a href="https://help.github.com/articles/syncing-a-fork/">Keep your fork in sync with Operation Code's master branch.</a></li>
208+
<li> <a href="https://help.github.com/articles/syncing-a-fork/">Keep your fork in sync with Operation Code's main branch.</a></li>
209209
</ol>
210210
</details>
211211

@@ -291,7 +291,7 @@ Download and install Git for Windows from https://git-scm.com/download/win
291291

292292
Download the latest version of python at https://www.python.org/downloads/, (3.7.3 at time of writing)
293293

294-
Follow the steps found in the [Quick Start Guide](https://github.com/OperationCode/back-end/blob/master/README.md#quick-start)
294+
Follow the steps found in the [Quick Start Guide](https://github.com/OperationCode/back-end/blob/main/README.md#quick-start)
295295

296296
Occasionally you will deal with path issues this is fixed within windows by adding the appropriate key value pair to the path.
297297

MAINTAINERS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This file lists how the Operation Code Back End project is maintained. When making changes to the system, this file tells you who needs to review your contribution - you need a simple majority of maintainers for the relevant subsystems to provide a 👍 on your pull request. Additionally, you need to not receive a veto from a lieutenant or the project lead.
44

5-
Check out [how Operation Code Open Source projects are maintained](https://github.com/OperationCode/START_HERE/blob/master/open_source_maintenance_policy.md) for details on the process, how to become a maintainer, lieutenant, or the project lead.
5+
Check out [how Operation Code Open Source projects are maintained](https://github.com/OperationCode/START_HERE/blob/main/open_source_maintenance_policy.md) for details on the process, how to become a maintainer, lieutenant, or the project lead.
66

77
# Project Lead
88

OPS.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ The backend is deployed to AWS ECS (Elastic Container Service) with separate sta
88

99
Docker images are automatically built and pushed to AWS ECR via GitHub Actions:
1010

11-
- **PR branches** (any branch except `master`): Automatically builds and pushes to `:staging` tag
12-
- **Master branch**: Automatically builds and pushes to `:prod` tag after CI checks pass
11+
- **PR branches** (any branch except `main`): Automatically builds and pushes to `:staging` tag
12+
- **main branch**: Automatically builds and pushes to `:prod` tag after CI checks pass
1313

1414
The automated builds use AWS OIDC for secure authentication (no long-lived credentials).
1515

@@ -208,8 +208,8 @@ After setup, the GitHub Actions workflow will automatically:
208208
- Push images to ECR with appropriate tags (`:staging` or `:prod`)
209209

210210
You can verify by:
211-
1. Pushing a commit to a non-master branch (should push `:staging`)
212-
2. Merging to master (should push `:prod` after tests pass)
211+
1. Pushing a commit to a non-main branch (should push `:staging`)
212+
2. Merging to main (should push `:prod` after tests pass)
213213
3. Checking ECR repository for new images
214214

215215
## Security Best Practices

src/gunicorn_config.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#
4949
# A positive integer generally set to around 1000.
5050
#
51-
# timeout - If a worker does not notify the master process in this
51+
# timeout - If a worker does not notify the main process in this
5252
# number of seconds it is killed and a new worker is spawned
5353
# to replace it.
5454
#
@@ -73,7 +73,7 @@
7373

7474
# preload_app - Load application code before forking worker processes.
7575
# This conserves memory and speeds up server boot times by loading
76-
# the Django application once in the master process, then forking
76+
# the Django application once in the main process, then forking
7777
# worker processes with shared code in memory.
7878
#
7979
# Greatly improves startup performance by eliminating redundant
@@ -186,7 +186,7 @@
186186
# A callable that accepts the same arguments as after_fork
187187
#
188188
# pre_exec - Called just prior to forking off a secondary
189-
# master process during things like config reloading.
189+
# main process during things like config reloading.
190190
#
191191
# A callable that takes a server instance as the sole argument.
192192
#

0 commit comments

Comments
 (0)