From c5a925fe2a418944eb846752c6fbe35d04730b68 Mon Sep 17 00:00:00 2001
From: Nigel Jones <nigel.l.jones+git@gmail.com>
Date: Thu, 20 Oct 2022 09:11:34 +0100
Subject: [PATCH] odpi/egeria#6907 master->main rename

Signed-off-by: Nigel Jones <nigel.l.jones+git@gmail.com>
---
 .github/workflows/codeql-analysis.yml |  4 ++--
 .github/workflows/node-build.yml      | 22 +++++++++++-----------
 README.md                             |  8 ++++----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 33bf8aa4..8babc0a2 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -10,10 +10,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [master]
+    branches: [main]
   schedule:
     - cron: '0 20 * * 0'
 
diff --git a/.github/workflows/node-build.yml b/.github/workflows/node-build.yml
index f0bfcc4c..98c5e03d 100644
--- a/.github/workflows/node-build.yml
+++ b/.github/workflows/node-build.yml
@@ -5,9 +5,9 @@ name: Egeria UI Build
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
-    branches: [master]
+    branches: [main]
 
 jobs:
 
@@ -59,10 +59,10 @@ jobs:
           password: ${{ secrets.QUAY_IO_ACCESS_TOKEN }}
         if: ${{ steps.check.outputs.changed == 'true' && github.event_name == 'push' && github.repository == 'odpi/egeria-ui' }}
       # For releases (ie not main) we push the image - but not the latest tag
-      - name: Build and push (not master merge)
+      - name: Build and push (not main merge)
         id: docker_build_release
         uses: docker/build-push-action@v2
-        if: ${{ steps.check.outputs.changed == 'true' && github.ref != 'refs/heads/master' }}
+        if: ${{ steps.check.outputs.changed == 'true' && github.ref != 'refs/heads/main' }}
         with:
           push:  ${{ github.event_name == 'push' && github.repository == 'odpi/egeria-ui' }}
           tags: odpi/egeria-ui:${{ steps.package-version.outputs.current-version}}, quay.io/odpi/egeria-ui:${{ steps.package-version.outputs.current-version}}
@@ -70,10 +70,10 @@ jobs:
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm64
       # For main code stream we push the image and add the latest tag
-      - name: Build and push (master merge)
-        id: docker_build_master
+      - name: Build and push (main merge)
+        id: docker_build_main
         uses: docker/build-push-action@v2
-        if: ${{ steps.check.outputs.changed == 'true' && github.ref == 'refs/heads/master' }}
+        if: ${{ steps.check.outputs.changed == 'true' && github.ref == 'refs/heads/main' }}
         with:
           push:  ${{ github.event_name == 'push' && github.repository == 'odpi/egeria-ui' }}
           tags: odpi/egeria-ui:${{ steps.package-version.outputs.current-version }}, odpi/egeria-ui:latest, quay.io/odpi/egeria-ui:${{ steps.package-version.outputs.current-version }}, quay.io/odpi/egeria-ui:latest
@@ -82,11 +82,11 @@ jobs:
           platforms: linux/amd64,linux/arm64
       # Note the digest
       - name: Image digest (release)
-        if: ${{ steps.check.outputs.changed == 'true' && github.ref != 'refs/heads/master' }}
+        if: ${{ steps.check.outputs.changed == 'true' && github.ref != 'refs/heads/main' }}
         run: echo ${{ steps.docker_build_release.outputs.digest }}
-      - name: Image digest (master)
-        if: ${{ steps.check.outputs.changed == 'true' && github.ref == 'refs/heads/master' }}
-        run: echo ${{ steps.docker_build_master.outputs.digest }}
+      - name: Image digest (main)
+        if: ${{ steps.check.outputs.changed == 'true' && github.ref == 'refs/heads/main' }}
+        run: echo ${{ steps.docker_build_main.outputs.digest }}
       # Save an artifact of the build tree & upload
       - name: Create Archive
         if: ${{ steps.check.outputs.changed == 'true' }}
diff --git a/README.md b/README.md
index 6b01d062..2c7ffc99 100644
--- a/README.md
+++ b/README.md
@@ -76,20 +76,20 @@ Egeria-UI use GitHub as its dependency provider, this means that all the release
 are being pushed to the Github Egeria-UI repository here [2].
 
 ```bash
-$ git clone https://github.com/odpi/egeria-ui     # clone and checkout to master branch
+$ git clone https://github.com/odpi/egeria-ui     # clone and checkout to main branch
 $ vim release-notes.md                            # add release notes
 $ git commit -m "Add release notes"
 $ npm version patch                               # (minor or major) this will create a new commit with the bumped version
                                                   # and also a git version tag
 $ # `npm publish .` won't be executed since we are using GitHub as a direct dependency
-$ git push origin master
-$ git push origin master --tags
+$ git push origin main
+$ git push origin main --tags
 $                                                 # the released version will be available at the git version tag or in the
                                                   # release page here [1]
 ```
 
 ## Links
-[0] - https://github.com/odpi/egeria/tree/master/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/
+[0] - https://github.com/odpi/egeria/tree/main/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/
 
 [1] - https://github.com/odpi/egeria-api-mocks