Skip to content

Commit 1d90616

Browse files
Migrate branch to main (#595)
1 parent 3ce2531 commit 1d90616

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

.github/workflows/ci.yml

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

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

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
name: 'CodeQL'
1+
name: "CodeQL"
22

33
on:
44
push:
5-
branches: [develop, master]
5+
branches: [develop, main]
66
pull_request:
77
# The branches below must be a subset of the branches above
88
branches: [develop]
99
schedule:
10-
- cron: '0 1 * * 1'
10+
- cron: "0 1 * * 1"
1111

1212
jobs:
1313
analyze:
@@ -19,7 +19,7 @@ jobs:
1919
matrix:
2020
# Override automatic language detection by changing the below list
2121
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
22-
language: ['javascript']
22+
language: ["javascript"]
2323
# Learn more...
2424
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
2525

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: "Master Build"
1+
name: "Main Build"
22

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

77
jobs:
88
frontend:
@@ -152,7 +152,7 @@ jobs:
152152
steps:
153153
- uses: actions/checkout@v4
154154
- name: Run Integration Tests
155-
run: docker compose -f ./integration/docker-compose.ci.master.yml up --exit-code-from cypress
155+
run: docker compose -f ./integration/docker-compose.ci.main.yml up --exit-code-from cypress
156156
- uses: actions/upload-artifact@v4
157157
if: always()
158158
with:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Retrospected
22

33
![GitHub package.json version](https://img.shields.io/github/package-json/v/antoinejaussoin/retro-board)
4-
[![Master Build](https://github.com/antoinejaussoin/retro-board/actions/workflows/master.yml/badge.svg)](https://github.com/antoinejaussoin/retro-board/actions/workflows/master.yml)
4+
[![Main Build](https://github.com/antoinejaussoin/retro-board/actions/workflows/main.yml/badge.svg)](https://github.com/antoinejaussoin/retro-board/actions/workflows/main.yml)
55
[![Canary Build](https://github.com/antoinejaussoin/retro-board/actions/workflows/canary.yml/badge.svg)](https://github.com/antoinejaussoin/retro-board/actions/workflows/canary.yml)
66
[![Alpha Build](https://github.com/antoinejaussoin/retro-board/actions/workflows/alpha.yml/badge.svg)](https://github.com/antoinejaussoin/retro-board/actions/workflows/alpha.yml)
77

@@ -866,4 +866,4 @@ Thanks to [UnDraw](https://undraw.co/) for some of the illustrations.
866866

867867
<a href="https://www.browserstack.com/"><img src="./content/browserstack.png" width="300" height="65"></a>
868868

869-
Please make your PRs from the **develop** branch, not **master**.
869+
Please make your PRs from the **develop** branch, not **main**.

integration/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
master:
1+
main:
22
docker-compose rm -s -v -f
3-
docker-compose -f docker-compose.local.master.yml pull
4-
docker-compose -f docker-compose.local.master.yml up
3+
docker-compose -f docker-compose.local.main.yml pull
4+
docker-compose -f docker-compose.local.main.yml up
55

66
local:
77
docker build -f ../backend/Dockerfile -t retrospected/backend:local ../backend
File renamed without changes.

integration/readme.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ It uses Cypress.
88

99
## CI
1010

11-
Integrations tests will run automatically on CI (GitHub Actions) when pushing to `develop`, `master` or the alpha branch.
11+
Integrations tests will run automatically on CI (GitHub Actions) when pushing to `develop`, `main` or the alpha branch.
1212

1313
## Local
1414

1515
You can manually run the tests by doing `make local`, which will open Cypress and show you the tests running.
1616
This will build local images for both the backend and the frontend and test them using Cypress.
1717

18-
## Master
18+
## Main
1919

20-
You can also run the tests on the Master branch by doing `make master`.
20+
You can also run the tests on the Main branch by doing `make main`.

k8s/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ You can (and you should) of course change these values to more secure passwords.
2828

2929
### Install the Ingress settings
3030

31-
- `kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/static/mandatory.yaml`
31+
- `kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/mandatory.yaml`
3232
- `minikube addons enable ingress`
3333

3434
More information here: https://kubernetes.github.io/ingress-nginx/deploy/#minikube

0 commit comments

Comments
 (0)