From ef037dfe2f922c394bd673b47e01fdb09f7ff230 Mon Sep 17 00:00:00 2001 From: Andrew Yuan Date: Tue, 2 Jun 2026 14:50:26 -0400 Subject: [PATCH] move all references from master to main, add trigger for main --- .github/workflows/create-release.yml | 6 +++--- .github/workflows/push-to-buf.yml | 1 + .github/workflows/trigger-api-go-delete-release.yml | 2 +- .github/workflows/trigger-api-go-publish-release.yml | 2 +- .github/workflows/trigger-api-go-update.yml | 5 +++-- Makefile | 6 +++--- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 988e55b92..cf927a589 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -6,7 +6,7 @@ on: branch: description: "Branch to be tagged" required: true - default: master + default: main tag: description: "Tag for new version (v1.23.4)" required: true @@ -90,7 +90,7 @@ jobs: check-compatibility-sdk-go: needs: prepare-inputs if: ${{ github.event.inputs.skip_sdk_check == false || github.event.inputs.skip_sdk_check == 'false' }} - uses: temporalio/api-go/.github/workflows/check-sdk-compat.yml@master + uses: temporalio/api-go/.github/workflows/check-sdk-compat.yml@main with: sdk_ref: latest api_ref: ${{ needs.prepare-inputs.outputs.api_go_commit_sha }} @@ -134,7 +134,7 @@ jobs: if: | !cancelled() && needs.create-release.result == 'success' - uses: temporalio/api-go/.github/workflows/create-release.yml@master + uses: temporalio/api-go/.github/workflows/create-release.yml@main with: ref: ${{ needs.prepare-inputs.outputs.api_go_commit_sha }} tag: ${{ github.event.inputs.tag }} diff --git a/.github/workflows/push-to-buf.yml b/.github/workflows/push-to-buf.yml index 8bc06615b..9311b09a1 100644 --- a/.github/workflows/push-to-buf.yml +++ b/.github/workflows/push-to-buf.yml @@ -6,6 +6,7 @@ on: - 'v**' branches: - master + - main permissions: contents: read jobs: diff --git a/.github/workflows/trigger-api-go-delete-release.yml b/.github/workflows/trigger-api-go-delete-release.yml index e5b30efa0..d6ded4dc7 100644 --- a/.github/workflows/trigger-api-go-delete-release.yml +++ b/.github/workflows/trigger-api-go-delete-release.yml @@ -6,7 +6,7 @@ on: jobs: trigger-api-go-delete-release: - uses: temporalio/api-go/.github/workflows/delete-release.yml@master + uses: temporalio/api-go/.github/workflows/delete-release.yml@main with: tag: ${{ github.event.release.tag_name }} api_commit_sha: ${{ github.event.release.target_commitish }} diff --git a/.github/workflows/trigger-api-go-publish-release.yml b/.github/workflows/trigger-api-go-publish-release.yml index e8c7c6f75..5c99224da 100644 --- a/.github/workflows/trigger-api-go-publish-release.yml +++ b/.github/workflows/trigger-api-go-publish-release.yml @@ -6,7 +6,7 @@ on: jobs: trigger-api-go-publish-release: - uses: temporalio/api-go/.github/workflows/publish-release.yml@master + uses: temporalio/api-go/.github/workflows/publish-release.yml@main with: tag: ${{ github.event.release.tag_name }} api_commit_sha: ${{ github.event.release.target_commitish }} diff --git a/.github/workflows/trigger-api-go-update.yml b/.github/workflows/trigger-api-go-update.yml index 7a23b3c73..97e4b5bb9 100644 --- a/.github/workflows/trigger-api-go-update.yml +++ b/.github/workflows/trigger-api-go-update.yml @@ -4,12 +4,13 @@ on: push: branches: - master + - main workflow_dispatch: inputs: branch: - description: "Branch in api-go repo to trigger update protos (default: master)" + description: "Branch in api-go repo to trigger update protos (default: main)" required: true - default: master + default: main jobs: notify: diff --git a/Makefile b/Makefile index ea42652e9..d449ad033 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ http-api-docs: ##### Plugins & tools ##### grpc-install: @printf $(COLOR) "Install/update protoc and plugins..." - @go install go.temporal.io/api/cmd/protogen@master + @go install go.temporal.io/api/cmd/protogen@main @go install google.golang.org/protobuf/cmd/protoc-gen-go@latest @go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest @go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@latest @@ -118,8 +118,8 @@ buf-lint: $(STAMPDIR)/buf-mod-prune (cd $(PROTO_ROOT) && buf lint) buf-breaking: - @printf $(COLOR) "Run buf breaking changes check against master branch..." - @(cd $(PROTO_ROOT) && buf breaking --against 'https://github.com/temporalio/api.git#branch=master') + @printf $(COLOR) "Run buf breaking changes check against main branch..." + @(cd $(PROTO_ROOT) && buf breaking --against 'https://github.com/temporalio/api.git#branch=main') nexus-rpc-yaml: nexus-rpc-yaml-install printf $(COLOR) "Generate nexus/temporal-proto-models-nexusrpc.yaml..."