Merge pull request #836 from ral-facilities/rename-master

Rename instances of "master" to "main"
ral-facilities · Apr 19, 2022 · 72c7e7a · 72c7e7a
2 parents 26e5726 + 1141827
commit 72c7e7a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -1,11 +1,11 @@
 name: CI Build
-on: 
+on:
   workflow_dispatch:
   pull_request:
-  # By default, the pull_request event type is not triggered when a PR is merged into master
+  # By default, the pull_request event type is not triggered when a PR is merged into main
   push:
     branches:
-      - master
+      - main
 
 jobs:
   lint-and-unit-test:
@@ -37,13 +37,13 @@ jobs:
           npm config set scripts-prepend-node-path true
           sudo apt-get install libgconf-2-4
           yarn --frozen-lockfile
-      
+
       # Linting and unit testing
       - name: Run linting
         run: yarn lint
       - name: Run unit tests
         run: yarn test:unit
-      
+
       # Test coverage upload
       - name: Upload unit test coverage for the Common package
         if: success()
@@ -74,7 +74,6 @@ jobs:
           flags: download
           fail_ci_if_error: true
 
-
   dataview-e2e-tests:
     name: DataGateway DataView End to End Tests
     runs-on: ubuntu-20.04
@@ -169,7 +168,7 @@ jobs:
           sed -i -e "s/\"log_level\": \"WARN\",/\"log_level\": \"DEBUG\",/" datagateway-api/datagateway_api/config.json.example
       - name: Create config.json
         run: cp datagateway-api/datagateway_api/config.json.example datagateway-api/datagateway_api/config.json
-      
+
       # DataGateway API dependencies
       - name: Install Poetry
         run: pip install poetry
@@ -181,7 +180,7 @@ jobs:
 
       - name: Start API
         run: cd datagateway-api; nohup poetry run python -m datagateway_api.src.main > api-output.txt &
-      
+
       # E2E tests
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -216,7 +215,6 @@ jobs:
           name: DataView-Screenshots
           path: packages/datagateway-dataview/cypress/screenshots
 
-
   download-e2e-tests:
     name: DataGateway Download End to End Tests
     runs-on: ubuntu-20.04
@@ -327,7 +325,7 @@ jobs:
           sed -i -e "s/\"log_level\": \"WARN\",/\"log_level\": \"DEBUG\",/" datagateway-api/datagateway_api/config.json.example
       - name: Create config.json
         run: cp datagateway-api/datagateway_api/config.json.example datagateway-api/datagateway_api/config.json
-      
+
       # DataGateway API dependencies
       - name: Install Poetry
         run: pip install poetry
@@ -339,7 +337,7 @@ jobs:
 
       - name: Start API
         run: cd datagateway-api; nohup poetry run python -m datagateway_api.src.main > api-output.txt &
-      
+
       # E2E tests
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -374,7 +372,6 @@ jobs:
           name: Download-Screenshots
           path: packages/datagateway-download/cypress/screenshots
 
-
   search-e2e-tests:
     name: DataGateway Search End to End Tests
     runs-on: ubuntu-20.04
@@ -467,7 +464,7 @@ jobs:
           sed -i -e "s/\"log_level\": \"WARN\",/\"log_level\": \"DEBUG\",/" datagateway-api/datagateway_api/config.json.example
       - name: Create config.json
         run: cp datagateway-api/datagateway_api/config.json.example datagateway-api/datagateway_api/config.json
-      
+
       # DataGateway API dependencies
       - name: Install Poetry
         run: pip install poetry
@@ -476,7 +473,7 @@ jobs:
       - name: Add dummy data to icatdb
         run: |
           cd datagateway-api; poetry run python -m util.icat_db_generator
-      
+
       # Recreate Lucene indexes
       - name: Login to ICAT
         run: |
@@ -497,7 +494,7 @@ jobs:
 
       - name: Start API
         run: cd datagateway-api; nohup poetry run python -m datagateway_api.src.main > api-output.txt &
-      
+
       # E2E tests
       - name: Checkout repo
         uses: actions/checkout@v2

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -1,7 +1,7 @@
 name: Release Build
 on:
   push:
-    branches: master
+    branches: main
     tags: '*'
 
 jobs:
@@ -41,7 +41,7 @@ jobs:
 
       - name: Determine tag name
         run: |
-          if [ "${{ github.ref }}" = "refs/heads/master" ]
+          if [ "${{ github.ref }}" = "refs/heads/main" ]
           then
             echo TAG_NAME=snapshot >> $GITHUB_ENV
           else
@@ -78,7 +78,7 @@ jobs:
           tag_name: ${{ env.TAG_NAME }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        if: ${{ github.ref == 'refs/heads/master' }}
+        if: ${{ github.ref == 'refs/heads/main' }}
 
       - name: Create/update release
         uses: johnwbyrd/[email protected]
@@ -87,5 +87,5 @@ jobs:
           files: ./datagateway-dataview-${{ env.TAG_NAME }}.tar.gz ./datagateway-download-${{ env.TAG_NAME }}.tar.gz ./datagateway-search-${{ env.TAG_NAME }}.tar.gz
           release: Release ${{ env.TAG_NAME }}
           tag: ${{ env.TAG_NAME }}
-          prerelease: ${{ github.ref == 'refs/heads/master' }}
+          prerelease: ${{ github.ref == 'refs/heads/main' }}
           draft: false
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # DataGateway
 
-[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Build Status](https://github.com/ral-facilities/datagateway/workflows/CI%20Build/badge.svg?branch=master)](https://github.com/ral-facilities/datagateway/actions?query=workflow%3A%22CI+Build%22) [![codecov](https://codecov.io/gh/ral-facilities/datagateway/branch/master/graph/badge.svg)](https://codecov.io/gh/ral-facilities/datagateway)
+[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Build Status](https://github.com/ral-facilities/datagateway/workflows/CI%20Build/badge.svg?branch=main)](https://github.com/ral-facilities/datagateway/actions?query=workflow%3A%22CI+Build%22) [![codecov](https://codecov.io/gh/ral-facilities/datagateway/branch/main/graph/badge.svg)](https://codecov.io/gh/ral-facilities/datagateway)
 
 DataGateway is a [ReactJs](https://reactjs.org/)-based web application that provides ways of discovering and accessing data produced at large-scale science facilities. DataGateway is
 a [micro-frontend](https://micro-frontends.org/) that can be integrated with the parent web application [SciGateway](https://github.com/ral-facilities/scigateway).
@@ -79,4 +79,3 @@ Lints all packages
 ### `yarn tsc`
 
 Runs `tsc` on all packages - currently this will re-build `datagateway-common`
-