From ded5ecb8f34da52caab225d811043aa5d767f7b7 Mon Sep 17 00:00:00 2001 From: remyvdwereld <86827854+remyvdwereld@users.noreply.github.com> Date: Sun, 25 Feb 2024 13:28:57 +0100 Subject: [PATCH] Changed master to main --- .github/workflows/bpmn.workflow.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/main.workflow.yml | 4 ++-- Jenkinsfile | 2 +- docs/CONTRIBUTING.md | 4 ++-- docs/architecture.md | 6 +++--- open-zaak/Jenkinsfile | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/bpmn.workflow.yml b/.github/workflows/bpmn.workflow.yml index a5a496d91..d029b47ba 100644 --- a/.github/workflows/bpmn.workflow.yml +++ b/.github/workflows/bpmn.workflow.yml @@ -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: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0c8fc8965..d0c157762 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -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' diff --git a/.github/workflows/main.workflow.yml b/.github/workflows/main.workflow.yml index 7b9cd8c1c..41089279d 100644 --- a/.github/workflows/main.workflow.yml +++ b/.github/workflows/main.workflow.yml @@ -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: diff --git a/Jenkinsfile b/Jenkinsfile index df69ddc35..eb9a0d589 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index d64be659e..eac6f9502 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -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 ``` diff --git a/docs/architecture.md b/docs/architecture.md index 917477ba0..c69dadd3d 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -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) diff --git a/open-zaak/Jenkinsfile b/open-zaak/Jenkinsfile index b6d0d3124..47249887f 100644 --- a/open-zaak/Jenkinsfile +++ b/open-zaak/Jenkinsfile @@ -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)