Skip to content

Commit

Permalink
Changed master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
remyvdwereld committed Feb 25, 2024
1 parent e34cbb3 commit ded5ecb
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/bpmn.workflow.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: 'Validate BPMN'
on:
push:
branches: [ master ]
branches: [ main ]
paths:
- 'app/apps/workflow/bpmn_files/**/**/**/*.bpmn'
pull_request:
branches: [ master, develop ]
branches: [ main, develop ]

jobs:
test:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "Discovering vulnerabilities using CodeQL"

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
branches: [ main ]
schedule:
- cron: '39 7 * * 2'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.workflow.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: 'Install, lint, test & build'
on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master, develop ]
branches: [ main, develop ]

jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ pipeline {
stage("Push and deploy acceptance images") {
when {
not { buildingTag() }
branch 'master'
branch 'main'
}
steps {
tag_and_deploy(env.ZAKEN_IMAGE_URL, env.ZAKEN_NAME, env.ACCEPTANCE)
Expand Down
4 changes: 2 additions & 2 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
To deploy a new version of AZA-backend you need to push a ....
tag to Github. Jenkins will create

We usually release from the master-branch. Create a new tag
We usually release from the main-branch. Create a new tag
with a semantic version number of format "v.x.x.x".
To see the latest tags use

```
git checkout master
git checkout main
git pull
git tag -l | tail
```
Expand Down
6 changes: 3 additions & 3 deletions docs/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ This section documents the architecture of the project. It includes proposal and
## Proposal
The following image is a proposal of the architecture and the direction this project is currently heading in.

![Voorstel Architectuur](https://github.com/Amsterdam/zaken-backend/blob/master/docs/architecture_proposal.png)
![Voorstel Architectuur](https://github.com/Amsterdam/zaken-backend/blob/main/docs/architecture_proposal.png)

## Current/Legacy architecture (14/1/21)
For documentation purposes. This is the current situation.

![Oude Architectuur](https://github.com/Amsterdam/zaken-backend/blob/master/docs/architecture_legacy.png)
![Oude Architectuur](https://github.com/Amsterdam/zaken-backend/blob/main/docs/architecture_legacy.png)

## Proposal Top - Zaken tunneling communication

![Tunneling Proposal](https://github.com/Amsterdam/zaken-backend/blob/master/docs/tunneling_proposal.png)
![Tunneling Proposal](https://github.com/Amsterdam/zaken-backend/blob/main/docs/tunneling_proposal.png)
2 changes: 1 addition & 1 deletion open-zaak/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ pipeline {
stage("Push and deploy acceptance images") {
when {
not { buildingTag() }
branch 'master'
branch 'main'
}
steps {
tag_and_deploy(env.OPEN_ZAAK_IMAGE_URL, env.OPEN_ZAAK_NAME, env.ACCEPTANCE)
Expand Down

0 comments on commit ded5ecb

Please sign in to comment.