Fix main branch in ci-mgmt config (#354)

- Allows us to check the master build runs correctly when merging PRs.
pulumi · Aug 22, 2024 · 98a7247 · 98a7247
1 parent 152efcd
commit 98a7247
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.ci-mgmt.yaml b/.ci-mgmt.yaml
@@ -3,6 +3,7 @@ env:
   PULUMI_MISSING_DOCS_ERROR: true
   XYZ_REGION: "us-west-2"
 makeTemplate: bridged
+providerDefaultBranch: main
 pulumiConvert: 1
 goBuildParallelism: 2
 major-version: 1

diff --git a/.github/workflows/community-moderation.yml b/.github/workflows/community-moderation.yml
@@ -38,6 +38,6 @@ name: warn-codegen
 on:
   pull_request_target:
     branches:
-    - master
+    - main
     types:
     - opened
diff --git a/.github/workflows/master.yml → .github/workflows/main.yml b/.github/workflows/master.yml → .github/workflows/main.yml
@@ -170,12 +170,12 @@ jobs:
         - dotnet
         - go
         - java
-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
@@ -66,7 +66,7 @@ jobs:
       uses: peter-evans/[email protected]
       with:
         author: pulumi-bot <[email protected]>
-        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}}
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,6 +38,6 @@ name: warn-codegen @@
     on:
       pull_request_target:
         branches:
-        - master
+        - main
         types:
         - opened