From 3487a7a713159d2f9e2d48e411b1895872ffd4c2 Mon Sep 17 00:00:00 2001 From: Livio Amstutz Date: Wed, 7 Apr 2021 16:07:15 +0200 Subject: [PATCH] chore: rename master to main (#1550) * chore: rename master to main * docs --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/docs.yml | 2 +- .github/workflows/zitadel.yml | 6 +++--- .releaserc.js | 2 +- README.md | 4 ++-- proto/zitadel/admin.proto | 2 +- proto/zitadel/management.proto | 2 +- site/docs/apis/01-authentication.md | 2 +- site/docs/apis/02-management.md | 2 +- site/docs/apis/03-administration.md | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 27e3b503e6..a63221c25d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,12 +2,12 @@ name: "Code scanning - action" on: push: - branches: [master, ] + branches: [main, ] paths-ignore: - 'site/**' pull_request: # The branches below must be a subset of the branches above - branches: [master] + branches: [main] paths-ignore: - 'site/**' schedule: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 004a2c1e1b..b716e30c02 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -34,7 +34,7 @@ jobs: name: Deploy needs: builddocs runs-on: ubuntu-latest - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' steps: - name: Checkout Repo uses: actions/checkout@master diff --git a/.github/workflows/zitadel.yml b/.github/workflows/zitadel.yml index 758eaabb5f..b6eab2077c 100644 --- a/.github/workflows/zitadel.yml +++ b/.github/workflows/zitadel.yml @@ -256,17 +256,17 @@ jobs: docker tag $REGISTRY/$GITHUB_REPOSITORY:${{ needs.refs.outputs.sha_short }} $REGISTRY/$GITHUB_REPOSITORY:${{ needs.refs.outputs.short_ref }} docker tag $REGISTRY/$OPERATOR_IMAGE_NAME:${{ needs.refs.outputs.sha_short }} $REGISTRY/$OPERATOR_IMAGE_NAME:${{ needs.refs.outputs.short_ref }} docker tag $REGISTRY/$CRDB_IMAGE_NAME:${{ needs.refs.outputs.sha_short }} $REGISTRY/$CRDB_IMAGE_NAME:${{ needs.refs.outputs.short_ref }} - if: steps.semantic.outputs.new_release_published != 'true' && needs.refs.outputs.short_ref != 'master' && needs.refs.outputs.short_ref != '' + if: steps.semantic.outputs.new_release_published != 'true' && needs.refs.outputs.short_ref != 'main' && needs.refs.outputs.short_ref != '' - name: Docker Push Version run: | docker push $REGISTRY/$GITHUB_REPOSITORY:${{ needs.refs.outputs.short_ref }} docker push $REGISTRY/$OPERATOR_IMAGE_NAME:${{ needs.refs.outputs.short_ref }} docker push $REGISTRY/$CRDB_IMAGE_NAME:${{ needs.refs.outputs.short_ref }} - if: steps.semantic.outputs.new_release_published != 'true' && needs.refs.outputs.short_ref != 'master' && needs.refs.outputs.short_ref != '' + if: steps.semantic.outputs.new_release_published != 'true' && needs.refs.outputs.short_ref != 'main' && needs.refs.outputs.short_ref != '' - name: Dev-Release id: create_release uses: ncipollo/release-action@v1.8.1 - if: steps.semantic.outputs.new_release_published != 'true' && needs.refs.outputs.short_ref != 'master' && needs.refs.outputs.short_ref != '' + if: steps.semantic.outputs.new_release_published != 'true' && needs.refs.outputs.short_ref != 'main' && needs.refs.outputs.short_ref != '' with: artifacts: "${{ env.ARTIFACTS_FOLDER }}/zitadelctl-darwin-amd64/zitadelctl-darwin-amd64,${{ env.ARTIFACTS_FOLDER }}/zitadelctl-linux-amd64/zitadelctl-linux-amd64,${{ env.ARTIFACTS_FOLDER }}/zitadelctl-windows-amd64/zitadelctl-windows-amd64.exe" body: | diff --git a/.releaserc.js b/.releaserc.js index 13f1979713..092e33ae35 100644 --- a/.releaserc.js +++ b/.releaserc.js @@ -1,5 +1,5 @@ module.exports = { - branches: ["master"], + branches: ["main"], plugins: [ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", diff --git a/README.md b/README.md index cced880c8d..6a4b5534fd 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) [![Release](https://github.com/caos/zitadel/workflows/Release/badge.svg)](https://github.com/caos/zitadel/actions) -[![license](https://badgen.net/github/license/caos/zitadel/)](https://github.com/caos/zitadel/blob/master/LICENSE) +[![license](https://badgen.net/github/license/caos/zitadel/)](https://github.com/caos/zitadel/blob/main/LICENSE) [![release](https://badgen.net/github/release/caos/zitadel/stable)](https://github.com/caos/zitadel/releases) [![Go Report Card](https://goreportcard.com/badge/github.com/caos/zitadel)](https://goreportcard.com/report/github.com/caos/zitadel) -[![codecov](https://codecov.io/gh/caos/zitadel/branch/master/graph/badge.svg)](https://codecov.io/gh/caos/zitadel) +[![codecov](https://codecov.io/gh/caos/zitadel/branch/main/graph/badge.svg)](https://codecov.io/gh/caos/zitadel) ## What Is ZITADEL diff --git a/proto/zitadel/admin.proto b/proto/zitadel/admin.proto index 362bc99095..7b5fdd8b9d 100644 --- a/proto/zitadel/admin.proto +++ b/proto/zitadel/admin.proto @@ -32,7 +32,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { }; license: { name: "Apache 2.0", - url: "https://github.com/caos/zitadel/blob/master/LICENSE"; + url: "https://github.com/caos/zitadel/blob/main/LICENSE"; }; }; diff --git a/proto/zitadel/management.proto b/proto/zitadel/management.proto index da0f4d8b56..021ff51ad1 100644 --- a/proto/zitadel/management.proto +++ b/proto/zitadel/management.proto @@ -38,7 +38,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { } license: { name: "Apache License 2.0", - url: "https://github.com/caos/zitadel/blob/master/LICENSE" + url: "https://github.com/caos/zitadel/blob/main/LICENSE" }; }; diff --git a/site/docs/apis/01-authentication.md b/site/docs/apis/01-authentication.md index 421f0fba7e..4b5933c4da 100644 --- a/site/docs/apis/01-authentication.md +++ b/site/docs/apis/01-authentication.md @@ -15,4 +15,4 @@ The authentication API (aka Auth API) is used for all operations on the currentl > At a later date we might expose functions to build your own login GUI > You can build your own user Register GUI already by utilizing the [Management API](#management) -[Latest API Version](https://github.com/caos/zitadel/blob/master/pkg/grpc/auth/proto/auth.proto) +[Latest API Version](https://github.com/caos/zitadel/blob/main/pkg/grpc/auth/proto/auth.proto) diff --git a/site/docs/apis/02-management.md b/site/docs/apis/02-management.md index a0af334c7a..2f109f5412 100644 --- a/site/docs/apis/02-management.md +++ b/site/docs/apis/02-management.md @@ -12,4 +12,4 @@ The management API is as the name states the interface where systems can mutate | REST | [https://api.zitadel.ch/management/v1/](https://api.zitadel.ch/management/v1/) | | GRPC | [https://api.zitadel.ch/caos.zitadel.management.api.v1.ManagementService/](https://api.zitadel.ch/caos.zitadel.management.api.v1.ManagementService) | -[Latest API Version](https://github.com/caos/zitadel/blob/master/pkg/grpc/management/proto/management.proto) +[Latest API Version](https://github.com/caos/zitadel/blob/main/pkg/grpc/management/proto/management.proto) diff --git a/site/docs/apis/03-administration.md b/site/docs/apis/03-administration.md index 41cbadd14e..dbf17884d8 100644 --- a/site/docs/apis/03-administration.md +++ b/site/docs/apis/03-administration.md @@ -12,4 +12,4 @@ This API is intended to configure and manage the IAM itself. | REST | [https://api.zitadel.ch/admin/v1/](https://api.zitadel.ch/admin/v1/) | | GRPC | [https://api.zitadel.ch/caos.zitadel.admin.api.v1.AdminService/](https://api.zitadel.ch/caos.zitadel.admin.api.v1.AdminService) | -[Latest API Version](https://github.com/caos/zitadel/blob/master/pkg/grpc/admin/proto/admin.proto) +[Latest API Version](https://github.com/caos/zitadel/blob/main/pkg/grpc/admin/proto/admin.proto)