Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Tests & Linting"

on:
push:
branches: [master, develop]
branches: [main, develop]
pull_request:
branches: []

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: 'CodeQL'
name: "CodeQL"

on:
push:
branches: [develop, master]
branches: [develop, main]
pull_request:
# The branches below must be a subset of the branches above
branches: [develop]
schedule:
- cron: '0 1 * * 1'
- cron: "0 1 * * 1"

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

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/master.yml → .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: "Master Build"
name: "Main Build"

on:
push:
branches: [master]
branches: [main]

jobs:
frontend:
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Run Integration Tests
run: docker compose -f ./integration/docker-compose.ci.master.yml up --exit-code-from cypress
run: docker compose -f ./integration/docker-compose.ci.main.yml up --exit-code-from cypress
- uses: actions/upload-artifact@v4
if: always()
with:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Retrospected

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

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

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

Please make your PRs from the **develop** branch, not **master**.
Please make your PRs from the **develop** branch, not **main**.
6 changes: 3 additions & 3 deletions integration/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
master:
main:
docker-compose rm -s -v -f
docker-compose -f docker-compose.local.master.yml pull
docker-compose -f docker-compose.local.master.yml up
docker-compose -f docker-compose.local.main.yml pull
docker-compose -f docker-compose.local.main.yml up

local:
docker build -f ../backend/Dockerfile -t retrospected/backend:local ../backend
Expand Down
6 changes: 3 additions & 3 deletions integration/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ It uses Cypress.

## CI

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

## Local

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

## Master
## Main

You can also run the tests on the Master branch by doing `make master`.
You can also run the tests on the Main branch by doing `make main`.
2 changes: 1 addition & 1 deletion k8s/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ You can (and you should) of course change these values to more secure passwords.

### Install the Ingress settings

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

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