Skip to content

Commit

Permalink
Merge pull request #2381 from Amsterdam/chore/rename-master-to-main
Browse files Browse the repository at this point in the history
rename master to main
  • Loading branch information
remyvdwereld authored Jan 3, 2024
2 parents 9f0e415 + b96c7ee commit 830ff7f
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
name: "Install, lint, test & build"

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
# events but only for the main branch
on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mirror-to-azure-devops.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Mirror to Azure DevOps
on:
push:
branches:
- master
- main

jobs:
mirror:
Expand All @@ -18,4 +18,4 @@ jobs:
AZURE_DEVOPS_REPO_URL_PAT: ${{ secrets.AZURE_DEVOPS_REPO_URL_PAT }}
run: |
git remote add azure-devops $AZURE_DEVOPS_REPO_URL_PAT
git push azure-devops master
git push azure-devops main
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ pipeline {
stage("Push and deploy acceptance image") {
when {
not { buildingTag() }
branch 'master'
branch 'main'
}
steps {
tag_image_as("acceptance")
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ klaargezet.
Clone this repository and install its dependencies:

```bash
git clone https://github.com/Amsterdam/fixxx-looplijsten-frontend.git
cd fixxx-looplijsten-frontend
git clone https://github.com/Amsterdam/top-frontend.git
cd top-frontend
npm install
```

Expand All @@ -28,7 +28,7 @@ Using the acceptance backend is easiest:
npm start
```

To use a local backend, clone the [backend repository](https://github.com/Amsterdam/fixxx-looplijsten-backend) and run
To use a local backend, clone the [backend repository](https://github.com/Amsterdam/top-backend) and run
the Docker instances.

```
Expand All @@ -37,9 +37,9 @@ npm run start:local

## Deploying

The `master` branch is automatically deployed to [acceptance](https://acc.top.amsterdam.nl/).
The `main` branch is automatically deployed to [acceptance](https://acc.top.amsterdam.nl/).

Tag any branch, but preferably master, with a tag like `v1.0.0` to deploy that specific commit
Tag any branch, but preferably main, with a tag like `v1.0.0` to deploy that specific commit
to [production](https://top.amsterdam.nl/).

## Storybook
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"swagger:generate-schema:local": "dtsgen -o ./src/__generated__/apiSchema.d.ts --url http://localhost:8000/api/v1/schema/",
"swagger:generate-schema:acc": "dtsgen -o ./src/__generated__/apiSchema.d.ts --url https://acc.api.top.amsterdam.nl/api/v1/schema/",
"swagger:generate-schema": "dtsgen -o ./src/__generated__/apiSchema.d.ts --url https://api.top.amsterdam.nl/api/v1/schema/",
"deploy:acc": "git push origin master",
"deploy:acc": "git push origin main",
"deploy:prod": "npm version patch && git push origin HEAD --follow-tags"
},
"jest": {
Expand Down

0 comments on commit 830ff7f

Please sign in to comment.