Chore: Move from master to main branch (#33693)

* Chore: Move from master branch to main Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * CI: Upgrade build pipeline tool to v2 Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2021-05-06 16:29:29 +02:00
parent 263d751860
commit c2c1ec7d0f
66 changed files with 192 additions and 192 deletions
@@ -15,7 +15,7 @@ jobs:
        with:
          text: ${{ github.event.inputs.version }}
          regex: '^(\d+.\d+).\d+(?:-beta.\d+)?$'
-          
+
      - name: Validate input version
        if: ${{ steps.regex-match.outputs.match == '' }}
        run: |
@@ -24,29 +24,29 @@ jobs:
          example: 7.4.3 or 7.4.3-beta.1"
          exit 1
      - uses: actions/checkout@v2
-      
+
      - name: Set intermedia variables
        id: intermedia
        run: |
          echo "::set-output name=short_ref::${GITHUB_REF#refs/*/}"
          echo "::set-output name=check_passed::false"
          echo "::set-output name=branch_name::v${{steps.regex-match.outputs.group1}}"
-          echo "::set-output name=branch_exist::$(git ls-remote --heads https://github.com/grafana/grafana.git v${{ steps.regex-match.outputs.group1 }}.x | wc -l)"      
-          
-      - name: Check input version is aligned with branch(not master)
+          echo "::set-output name=branch_exist::$(git ls-remote --heads https://github.com/grafana/grafana.git v${{ steps.regex-match.outputs.group1 }}.x | wc -l)"
+
+      - name: Check input version is aligned with branch(not main)
        if: steps.intermedia.outputs.branch_exist != '0' && !contains(steps.intermedia.outputs.short_ref, steps.intermedia.outputs.branch_name)
        run: |
          echo " You need to run the workflow on branch v${{steps.regex-match.outputs.group1}}.x
          exit 1
-      
-      - name: Check input version is aligned with branch(master)
+
+      - name: Check input version is aligned with branch(main)
        if: steps.intermedia.outputs.branch_exist == '0' && !contains(steps.intermedia.outputs.short_ref, 'main')
        run: |
          echo "When you want to deliver a new new minor version, you might want to create a new branch first \
          with naming convention v[major].[minor].x, and just run the workflow on that branch. \
-          Run the workflow on master only when needed"
+          Run the workflow on main only when needed"
          exit 1
-          
+
      - name: Checkout Actions
        uses: actions/checkout@v2
        with:
@@ -7,10 +7,10 @@ name: "CodeQL"

 on:
  push:
-    branches: [master, v1.8.x, v2.0.x, v2.1.x, v2.6.x, v3.0.x, v3.1.x, v4.0.x, v4.1.x, v4.2.x, v4.3.x, v4.4.x, v4.5.x, v4.6.x, v4.7.x, v5.0.x, v5.1.x, v5.2.x, v5.3.x, v5.4.x, v6.0.x, v6.1.x, v6.2.x, v6.3.x, v6.4.x, v6.5.x, v6.6.x, v6.7.x, v7.0.x, v7.1.x, v7.2.x]
+    branches: [main, v1.8.x, v2.0.x, v2.1.x, v2.6.x, v3.0.x, v3.1.x, v4.0.x, v4.1.x, v4.2.x, v4.3.x, v4.4.x, v4.5.x, v4.6.x, v4.7.x, v5.0.x, v5.1.x, v5.2.x, v5.3.x, v5.4.x, v6.0.x, v6.1.x, v6.2.x, v6.3.x, v6.4.x, v6.5.x, v6.6.x, v6.7.x, v7.0.x, v7.1.x, v7.2.x]
  pull_request:
    # The branches below must be a subset of the branches above
-    branches: [master]
+    branches: [main]
  schedule:
    - cron: '0 4 * * 6'

@@ -42,7 +42,7 @@ jobs:
      with:
        languages: ${{ matrix.language }}
        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
+        # By default, queries listed here will override any specified in a config file.
        # Prefix the list here with "+" to use these queries and those in the config file.
        # queries: ./path/to/local/query, your-org/your-repo/queries@main

@@ -3,7 +3,7 @@ name: publish_docs
 on:
  push:
    branches:
-    - master
+    - main
    paths:
    - 'docs/sources/**'
    - 'packages/grafana-*/**'