From db0fbfa1febf2b85eda2a3dff4398c8a03d878d2 Mon Sep 17 00:00:00 2001 From: Bryce Lampe Date: Fri, 6 Dec 2024 08:21:31 -0800 Subject: [PATCH 1/2] Fix default branch name --- .ci-mgmt.yaml | 1 + .github/workflows/community-moderation.yml | 2 +- .github/workflows/{master.yml => main.yml} | 4 ++-- .github/workflows/resync-build.yml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) rename .github/workflows/{master.yml => main.yml} (99%) diff --git a/.ci-mgmt.yaml b/.ci-mgmt.yaml index 7fc3b9c6..455f5b98 100644 --- a/.ci-mgmt.yaml +++ b/.ci-mgmt.yaml @@ -15,5 +15,6 @@ env: PULUMI_TEST_OWNER: service-provider-test-org PULUMI_TEST_USE_SERVICE: true +defaultBranch: main template: generic shards: 6 diff --git a/.github/workflows/community-moderation.yml b/.github/workflows/community-moderation.yml index fc701df6..cc672ffb 100644 --- a/.github/workflows/community-moderation.yml +++ b/.github/workflows/community-moderation.yml @@ -40,6 +40,6 @@ name: warn-codegen on: pull_request_target: branches: - - master + - main types: - opened diff --git a/.github/workflows/master.yml b/.github/workflows/main.yml similarity index 99% rename from .github/workflows/master.yml rename to .github/workflows/main.yml index 39bba621..a4a34a79 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/main.yml @@ -97,12 +97,12 @@ jobs: with: version: ${{ needs.prerequisites.outputs.version }} -name: master +name: main on: workflow_dispatch: {} push: branches: - - master + - main paths-ignore: - "**.md" tags-ignore: diff --git a/.github/workflows/resync-build.yml b/.github/workflows/resync-build.yml index 1e44841c..562f0798 100644 --- a/.github/workflows/resync-build.yml +++ b/.github/workflows/resync-build.yml @@ -72,7 +72,7 @@ jobs: uses: peter-evans/create-pull-request@v3.12.0 with: author: pulumi-bot - base: master + base: main body: This pull request was generated automatically by the resync-build workflow in this repository. branch: pulumi-bot/resync-${{ github.run_id}} From 4ce9a7c078596e28b0dd31cd13a386003e0bbd1d Mon Sep 17 00:00:00 2001 From: Bryce Lampe Date: Fri, 6 Dec 2024 08:25:49 -0800 Subject: [PATCH 2/2] fix comment --- .github/workflows/community-moderation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/community-moderation.yml b/.github/workflows/community-moderation.yml index cc672ffb..54fbd4ea 100644 --- a/.github/workflows/community-moderation.yml +++ b/.github/workflows/community-moderation.yml @@ -35,7 +35,7 @@ jobs: Be sure any files you're editing do not begin with a code generation warning. - For generated files, you will need to make changes in `resources.go` instead, and [generate the code](https://github.com/pulumi/${{ github.event.repository.name }}/blob/master/CONTRIBUTING.md#committing-generated-code). + For generated files, you will need to make changes in `resources.go` instead, and [generate the code](https://github.com/pulumi/${{ github.event.repository.name }}/blob/main/CONTRIBUTING.md#committing-generated-code). name: warn-codegen on: pull_request_target: