From 524f446cb0560dcb815309b99c700632d6e3e7da Mon Sep 17 00:00:00 2001 From: koros Date: Fri, 28 Jun 2024 12:38:41 +0300 Subject: [PATCH 1/2] update github workflows to use main branch --- .github/workflows/auto-merge-dependabot.yml | 2 +- .github/workflows/build.yml | 6 +++--- .github/workflows/codeql.yml | 4 ++-- .github/workflows/project-auto-add.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml index 11e6587c5af..72d96dd1d57 100644 --- a/.github/workflows/auto-merge-dependabot.yml +++ b/.github/workflows/auto-merge-dependabot.yml @@ -2,7 +2,7 @@ name: Auto-merge dependabot updates on: pull_request: - branches: [ dev ] + branches: [ main ] permissions: pull-requests: write diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9e62d8510a3..59f92fc7bc5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,9 +5,9 @@ name: Node.js CI on: workflow_dispatch: push: - branches: [dev] + branches: [main] pull_request: - branches: [dev] + branches: [main] jobs: build: @@ -63,7 +63,7 @@ jobs: run: exit 1 publish-npm: - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/dev' && !contains(github.event.head_commit.message, 'auto dependabot') }} + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && !contains(github.event.head_commit.message, 'auto dependabot') }} needs: build environment: name: production_feed diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b9ec8a68aae..3936752867f 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ "dev", "main" ] + branches: [ "main" ] pull_request: # The branches below must be a subset of the branches above - branches: [ "dev" ] + branches: [ "main" ] schedule: - cron: '37 21 * * 1' diff --git a/.github/workflows/project-auto-add.yml b/.github/workflows/project-auto-add.yml index 09d9707765f..db9e8d39680 100644 --- a/.github/workflows/project-auto-add.yml +++ b/.github/workflows/project-auto-add.yml @@ -9,7 +9,7 @@ on: types: - opened branches: - - "dev" + - "main" jobs: track_issue: From bb24b2e2cd1688bae4dfa62250295017bbb90f09 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Fri, 28 Jun 2024 08:48:03 -0400 Subject: [PATCH 2/2] fix: replaces dev by main on missing files Signed-off-by: Vincent Biret --- .github/policies/msgraph-sdk-typescript-branch-protection.yml | 4 ++-- CONTRIBUTING.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/policies/msgraph-sdk-typescript-branch-protection.yml b/.github/policies/msgraph-sdk-typescript-branch-protection.yml index ecea304f773..94cd3401b57 100644 --- a/.github/policies/msgraph-sdk-typescript-branch-protection.yml +++ b/.github/policies/msgraph-sdk-typescript-branch-protection.yml @@ -9,9 +9,9 @@ resource: repository configuration: branchProtectionRules: - - branchNamePattern: dev + - branchNamePattern: main # This branch pattern applies to the following branches as of 08/23/2023 13:45:40: - # dev + # main # Specifies whether this branch can be deleted. boolean allowsDeletions: false diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4cd1269d7f8..25561230cb1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ The best way to get started with a contribution is to start a dialog with us. Sometimes features will be under development or out of scope for this library and it's best to check before starting work on contribution, especially for large work items. ## Pull requests -All pull requests should be submitted against the **dev** branch or a specific feature branch. +All pull requests should be submitted against the **main** branch or a specific feature branch. Some things to note about this project: