chore: rename master to main

.circleci/config.yml

@@ -16,7 +16,7 @@ orbs:
     GARDEN_LOGGER_TYPE: basic
 
   shared-machine-config: &shared-machine-config
-    image: 'ubuntu-2004:202010-01'
+    image: "ubuntu-2004:202010-01"
     docker_layer_caching: true
 
   remote-docker: &remote-docker
@@ -43,11 +43,11 @@ orbs:
     attach_workspace:
       at: ./
 
-  # Only run jobs on master
-  only-master: &only-master
+  # Only run jobs on main
+  only-main: &only-main
     filters:
       branches:
-        only: master
+        only: main
       tags:
         ignore: /.*/
 
@@ -81,8 +81,8 @@ commands:
     steps:
       - restore_cache:
           keys:
-          - yarn-v4-<<parameters.context>>-{{ checksum "yarn.lock" }}
-          - yarn-v4-<<parameters.context>>
+            - yarn-v4-<<parameters.context>>-{{ checksum "yarn.lock" }}
+            - yarn-v4-<<parameters.context>>
 
       - run: yarn
 
@@ -100,7 +100,6 @@ commands:
             git config --global user.name "Garden CI"
             git config --global user.email "admin@garden.io"
 
-
   install_kubectl:
     description: Install kubectl
     steps:
@@ -489,8 +488,8 @@ jobs:
       - deploy:
           name: Release docker images
           command: |
-            # Switches between git tag and master for releases
-            TAG=${CIRCLE_TAG:-master}
+            # Switches between git tag and main for releases
+            TAG=${CIRCLE_TAG:-main}
             # Push the container
             ./scripts/push-containers.sh $TAG
             # Push again with latest tag for non-pre-release tags
@@ -588,7 +587,7 @@ jobs:
       # Restore Maven cache
       - restore_cache:
           keys:
-          - m2-v1
+            - m2-v1
       # Run tests
       - run:
           name: Plugin tests
@@ -1024,18 +1023,18 @@ workflows:
           requires: [build]
           kindNodeImage: kindest/node:v1.21.2
 
-      ### MASTER ONLY ###
+      ### MAIN ONLY ###
 
       # TODO: Re-enable this if we can figure out a way to not spam users who have starred the repo.
       # - build-dist-edge:
-      #     <<: *only-master
+      #     <<: *only-main
       #     requires: [build]
       # - release-service-docker:
-      #     <<: *only-master
+      #     <<: *only-main
       #     context: docker
       #     requires: [build-dist-edge]
       # - release-service-dist-edge:
-      #     <<: *only-master
+      #     <<: *only-main
       #     requires: [build-dist-edge]
 
   tags:

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 <!--  Thanks for sending a pull request!  Here are some tips for you:
 
-1. If this is your first pull request, please read our contributor guidelines in the https://github.com/garden-io/garden/blob/master/CONTRIBUTING.md file.
+1. If this is your first pull request, please read our contributor guidelines in the https://github.com/garden-io/garden/blob/main/CONTRIBUTING.md file.
 2. Please label this pull request according to what type of issue you are addressing (see "What type of PR is this?" below)
 3. Ensure you have added or run the appropriate tests for your PR.
 4. If the PR is unfinished, add `WIP:` at the beginning of the title or use the Github Draft PR feature.

.github/workflows/scorecards.yml

@@ -3,9 +3,9 @@ on:
   # Only the default branch is supported.
   branch_protection_rule:
   schedule:
-    - cron: '31 20 * * 0'
+    - cron: "31 20 * * 0"
   push:
-    branches: [ "master" ]
+    branches: ["main"]
 
 # Declare default permissions as read only.
 permissions: read-all
@@ -22,7 +22,7 @@ jobs:
       # Needs for private repositories.
       contents: read
       actions: read
-    
+
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@dd2c410b088af7c0dc8046f3ac9a8f4148492a95
@@ -53,8 +53,8 @@ jobs:
           # repo_token: ${{ secrets.SCORECARD_READ_TOKEN }}
 
           # Publish the results for public repositories to enable scorecard badges. For more details, see
-          # https://github.com/ossf/scorecard-action#publishing-results. 
-          # For private repositories, `publish_results` will automatically be set to `false`, regardless 
+          # https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories, `publish_results` will automatically be set to `false`, regardless
           # of the value entered here.
           publish_results: true
 
@@ -66,7 +66,7 @@ jobs:
           name: SARIF file
           path: results.sarif
           retention-days: 5
-      
+
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
         uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5 # v1.0.26

.github/workflows/update-homebrew-action.yml

@@ -4,41 +4,40 @@ on:
   release:
     types: [published]
 
-permissions:  # added using https://github.com/step-security/secure-workflows
+permissions: # added using https://github.com/step-security/secure-workflows
   contents: read
 
 jobs:
   homebrew-release:
-
-    runs-on: macOS-latest
+    runs-on: macos-latest
 
     steps:
-    - name: Checks if pre-release
-      if: github.event.release.prerelease == true
-      run: |
-        echo This is running against a pre-release.
-        echo Skipping all the next steps.
-    - name: Release Homebrew Formula
-      if: github.event.release.prerelease != true
-      uses: mislav/bump-homebrew-formula-action@21991dc8f899341b552c9842957677139a340980
-      with:
-        formula-name: garden-cli
-        formula-path: Formula/garden-cli.rb
-        homebrew-tap: garden-io/homebrew-garden
-        base-branch: master
-        create-pullrequest: true
-        download-url: https://download.garden.io/core/${{ github.event.release.tag_name }}/garden-${{ github.event.release.tag_name }}-macos-amd64.tar.gz
-        commit-message: |
-          Bump {{formulaName}} to {{version}}.
+      - name: Checks if pre-release
+        if: github.event.release.prerelease == true
+        run: |
+          echo This is running against a pre-release.
+          echo Skipping all the next steps.
+      - name: Release Homebrew Formula
+        if: github.event.release.prerelease != true
+        uses: mislav/bump-homebrew-formula-action@21991dc8f899341b552c9842957677139a340980
+        with:
+          formula-name: garden-cli
+          formula-path: Formula/garden-cli.rb
+          homebrew-tap: garden-io/homebrew-garden
+          base-branch: main
+          create-pullrequest: true
+          download-url: https://download.garden.io/core/${{ github.event.release.tag_name }}/garden-${{ github.event.release.tag_name }}-macos-amd64.tar.gz
+          commit-message: |
+            Bump {{formulaName}} to {{version}}.
 
-          For more info: https://github.com/garden-io/garden
-      env:
-        COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}
-    - name: Test Homebrew package
-      if: github.event.release.prerelease != true
-      run: |
-        echo 'Testing brew install'
-        brew tap garden-io/garden
-        brew install garden-cli
-        echo 'Running garden --version'
-        garden --version
+            For more info: https://github.com/garden-io/garden
+        env:
+          COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}
+      - name: Test Homebrew package
+        if: github.event.release.prerelease != true
+        run: |
+          echo 'Testing brew install'
+          brew tap garden-io/garden
+          brew install garden-cli
+          echo 'Running garden --version'
+          garden --version

README.md

@@ -8,7 +8,7 @@
   <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
   <a href="https://docs.garden.io/?utm_source=github">Docs</a>
   <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
-  <a href="https://github.com/garden-io/garden/tree/master/examples">Examples</a>
+  <a href="https://github.com/garden-io/garden/tree/main/examples">Examples</a>
   <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
   <a href="https://garden.io/blog/?utm_source=github">Blog</a>
   <span>&nbsp;&nbsp;•&nbsp;&nbsp;</span>
@@ -32,7 +32,7 @@ With Garden you can:
 
 This is the repo for the open source Garden Core. To learn more about Garden Cloud [click here](https://cloud.docs.garden.io/).
 
-*If you’re using Garden or if you like the project, please ★ star this repository to show your support 💖*
+_If you’re using Garden or if you like the project, please ★ star this repository to show your support 💖_
 
 ### **Getting started**
 
@@ -70,7 +70,7 @@ With the Stack Graph, each part of your stack describes itself using simple, int
 
 ![Stack Graph](docs/stack-graph-drawing.png)
 
-Garden then leverages your *existing tools and infrastructure* to execute this graph, allowing you to go **from zero to a running system in a single command**. And thanks to smart caching, it’s fast!
+Garden then leverages your _existing tools and infrastructure_ to execute this graph, allowing you to go **from zero to a running system in a single command**. And thanks to smart caching, it’s fast!
 
 For example, to create a preview environment on every pull request, simply add the following to your CI pipeline:
 
@@ -130,7 +130,7 @@ You can also head to our [community forum](https://community.garden.io/) for Qs
 
 If you find a security issue in Garden, please follow responsible disclosure practices and send information about security issues directly to security@garden.io.
 
-For more details [see here](https://github.com/garden-io/garden/blob/master/SECURITY.md).
+For more details [see here](https://github.com/garden-io/garden/blob/main/SECURITY.md).
 
 ### **Telemetry**
 
@@ -142,4 +142,4 @@ If you are curious to see an example of the data we collect or if you would like
 
 ### **License**
 
-Garden is licensed according to [Mozilla Public License 2.0 (MPL-2.0)](https://github.com/garden-io/garden/blob/master/LICENSE.md).
+Garden is licensed according to [Mozilla Public License 2.0 (MPL-2.0)](https://github.com/garden-io/garden/blob/main/LICENSE.md).